Skip CNV/ODF upgrade when Cluster is already upgraded

redhat-performance · Sep 30, 2024 · d98680c · d98680c
1 parent 5fe07ce
commit d98680c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py b/benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py
@@ -239,6 +239,7 @@ def run_ocp_upgrade(self, oc: OC):
         """
         if f'Cluster version is {self._upgrade_ocp_version}' == oc.get_cluster_status():
             logger.info(f'Cluster is already upgraded to: {self._upgrade_ocp_version}')
+            return 'Cluster is already upgraded'
         else:
             logger.info(f'Starting OCP upgrade, Start time: {datetime.now().strftime(datetime_format)}')
             logger.info(f'Stop OCP healthcheck')

diff --git a/benchmark_runner/main/main.py b/benchmark_runner/main/main.py
@@ -159,10 +159,10 @@ def upgrade_ocp_bare_metal(step: str):
     bare_metal_operations.connect_to_provisioner()
     oc = bare_metal_operations.oc_login()
     if step == 'run_bare_metal_ocp_upgrade':
-        bare_metal_operations.run_ocp_upgrade(oc)
-        # The LSO/ODF upgrade must be run manually after the OCP upgrade for the channel version; it won't upgrade automatically.
-        bare_metal_operations.install_ocp_resources(resources=['lso'], upgrade_version=lso_version)
-        bare_metal_operations.install_ocp_resources(resources=['odf'], upgrade_version=odf_version)
+        if not bare_metal_operations.run_ocp_upgrade(oc) == 'Cluster is already upgraded':
+            # The LSO/ODF upgrade must be run manually after the OCP upgrade for the channel version; it won't upgrade automatically.
+            bare_metal_operations.install_ocp_resources(resources=['lso'], upgrade_version=lso_version)
+            bare_metal_operations.install_ocp_resources(resources=['odf'], upgrade_version=odf_version)
     elif step == 'verify_bare_metal_upgrade_complete':
         if bare_metal_operations.is_cluster_upgraded(oc, cnv_version=cnv_version, odf_version=odf_version, lso_version=lso_version):
             bare_metal_operations.verify_cluster_is_up(oc)