From 42991e8a1360ffae02ba183edd5d301a4b3d0347 Mon Sep 17 00:00:00 2001 From: Tarun Kumar Date: Wed, 27 Mar 2024 13:22:39 +0530 Subject: [PATCH 1/2] Use cluster id while adding machinepool Signed-off-by: Tarun Kumar --- ods_ci/utils/scripts/ocm/ocm.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ods_ci/utils/scripts/ocm/ocm.py b/ods_ci/utils/scripts/ocm/ocm.py index 9054eba54..24ab5943a 100644 --- a/ods_ci/utils/scripts/ocm/ocm.py +++ b/ods_ci/utils/scripts/ocm/ocm.py @@ -378,9 +378,10 @@ def add_machine_pool(self): if bool(self.reuse_machine_pool) and self.check_if_machine_pool_exists(): log.info(f"MachinePool with name {self.pool_name} exists in cluster {self.cluster_name}. Hence reusing it") else: + cluster_id = self.get_osd_cluster_id() cmd = "ocm --v={} create machinepool --cluster {} --instance-type {} --replicas {} --taints {} {}".format( self.ocm_verbose_level, - self.cluster_name, + self.cluster_id, self.pool_instance_type, self.pool_node_count, self.taints, @@ -508,6 +509,7 @@ def hide_values_in_op_json(self, fields, json_str): p["value"] = "##hidden##" return json.dumps(json_dict) + # noinspection PyInterpreter def install_addon( self, addon_name="managed-odh", From fef23bbd537e5b10bdfbcfbfa558742ad0db8b26 Mon Sep 17 00:00:00 2001 From: Tarun Kumar Date: Wed, 27 Mar 2024 13:38:46 +0530 Subject: [PATCH 2/2] remove comment Signed-off-by: Tarun Kumar --- ods_ci/utils/scripts/ocm/ocm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ods_ci/utils/scripts/ocm/ocm.py b/ods_ci/utils/scripts/ocm/ocm.py index 24ab5943a..7f320c8d2 100644 --- a/ods_ci/utils/scripts/ocm/ocm.py +++ b/ods_ci/utils/scripts/ocm/ocm.py @@ -509,7 +509,6 @@ def hide_values_in_op_json(self, fields, json_str): p["value"] = "##hidden##" return json.dumps(json_dict) - # noinspection PyInterpreter def install_addon( self, addon_name="managed-odh",