benchmark-runner 1.0.827__py3-none-any.whl → 1.0.829__py3-none-any.whl

benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py

@@ -42,6 +42,8 @@ class BareMetalOperations:
         self._upgrade_ocp_version = self._environment_variables_dict.get('upgrade_ocp_version', '')
         self._upgrade_channel = self._environment_variables_dict.get('upgrade_channel', '')
         self._timeout = int(self._environment_variables_dict.get('timeout', ''))
+        self._must_gather_log = self._environment_variables_dict.get('must_gather_log', '')
+        self._run_artifacts_path = self._environment_variables_dict.get('run_artifacts_path', '')
         if user:
             self._user = user
             self._provision_kubeadmin_password_path = self._environment_variables_dict.get('provision_kubeadmin_password_path', '')
@@ -107,14 +109,17 @@ class BareMetalOperations:
         current_wait_time = 0
         logger.info(f'Waiting until the upgrade to version {self._upgrade_ocp_version} starts...')
         oc.wait_for_ocp_upgrade_start(upgrade_version=self._upgrade_ocp_version)
-        while self._timeout <= 0 or current_wait_time <= self._timeout and oc.upgrade_in_progress():
+        while (self._timeout <= 0 or current_wait_time <= self._timeout) and oc.upgrade_in_progress():
             logger.info(f'Waiting till OCP upgrade complete, waiting {int(current_wait_time / 60)} minutes')
             # sleep for x seconds
             time.sleep(sleep_time)
             current_wait_time += sleep_time
-        if f'Cluster version is {self._upgrade_ocp_version}' == oc.get_cluster_status():
+        if oc.get_upgrade_version() == self._upgrade_ocp_version:
+            logger.info(f"OCP successfully upgraded to {oc.get_upgrade_version()}")
             return True
         else:
+            if self._must_gather_log:
+                oc.generate_must_gather(destination_path=self._run_artifacts_path)
             raise OCPUpgradeFailed(status=oc.get_cluster_status())
 
     def _install_ocp_cmd(self):

benchmark_runner/common/oc/oc.py

@@ -101,11 +101,24 @@ class OC(SSH):
 
     def upgrade_in_progress(self):
         """
-        This method returns True when an upgrade is in progress and False when it is not.
+        This method returns True if an upgrade is in progress and False otherwise, with retries on transient failures.
         @return: bool
         """
-        status = self.run(f"{self._cli} get clusterversion version -o jsonpath='{{.status.conditions[?(@.type==\"Progressing\")].status}}'")
-        return status == 'True'
+        for i in range(1, self.RETRIES + 1):
+            try:
+                status = self.run(
+                    f"{self._cli} get clusterversion version "
+                    "-o jsonpath='{{.status.conditions[?(@.type==\"Progressing\")].status}}'"
+                ).strip()
+                return status == 'True'
+            except Exception as e:
+                logger.warning(f"[upgrade_in_progress] attempt {i}/{self.RETRIES} failed: {e}")
+                time.sleep(self.DELAY)
+        # Final attempt (will bubble if it fails)
+        return self.run(
+            f"{self._cli} get clusterversion version "
+            "-o jsonpath='{{.status.conditions[?(@.type==\"Progressing\")].status}}'"
+        ).strip() == 'True'
 
     @logger_time_stamp
     def wait_for_ocp_upgrade_start(self, upgrade_version: str, timeout: int = SHORT_TIMEOUT):
@@ -1521,6 +1534,29 @@ class OC(SSH):
                             results_list.append(line.strip().split(':')[data_index:])
         return results_list
 
+    @typechecked
+    @logger_time_stamp
+    def generate_must_gather(self, destination_path: str = '/tmp'):
+        """
+        Generates OpenShift must-gather and stores it in the destination path.
+
+        :param destination_path: The directory where the must-gather logs will be stored. Default is '/tmp'.
+        :return: The result of the run command.
+        :raises: RuntimeError if the command fails.
+        """
+        folder_path = os.path.join(destination_path, "must-gather")
+
+        try:
+            command = f'oc adm must-gather --dest-dir={folder_path}'
+            self.run(command)
+        except Exception as e:
+            if os.path.exists(folder_path):
+                try:
+                    shutil.rmtree(folder_path)
+                except Exception as remove_error:
+                    raise RuntimeError(f"Failed to remove folder {folder_path}: {remove_error}")
+            raise RuntimeError(f"Failed to generate OCP must-gather logs for version: {e}")
+
     @typechecked
     @logger_time_stamp
     def generate_odf_must_gather(self, destination_path: str = '/tmp', odf_version: str = None):

benchmark_runner/workloads/bootstorm_vm.py

@@ -304,6 +304,7 @@ class BootstormVM(WorkloadsOperations):
 
             if failure_vms:
                 if self._must_gather_log:
+                    self._oc.generate_must_gather(destination_path=self._run_artifacts_path)
                     self._oc.generate_cnv_must_gather(destination_path=self._run_artifacts_path, cnv_version=self._cnv_version)
                     self._oc.generate_odf_must_gather(destination_path=self._run_artifacts_path, odf_version=self._odf_version)
                 # Error log with details of failed VM, for catching all vm errors

{benchmark_runner-1.0.827.dist-info → benchmark_runner-1.0.829.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.827
+Version: 1.0.829
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.827.dist-info → benchmark_runner-1.0.829.dist-info}/RECORD

@@ -23,7 +23,7 @@ benchmark_runner/common/clouds/Azure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 benchmark_runner/common/clouds/Azure/azure_operations.py,sha256=Ok3l0rxCAqZd2_yzuOuUO6Zs3KjvYC85p2VQf7uyMnM,4735
 benchmark_runner/common/clouds/BareMetal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/clouds/BareMetal/bare_metal_exceptions.py,sha256=d-aeCfsfGpZ3e1Bho1M8pYlN0D8R-ffjwPm9YwGHvhU,1552
-benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=8N6p_H-vHuatmkhBr7zIISFGVacrfdNH3gbRIfhieq8,18804
+benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=lNkiRDbOFdNCcwD-jrO1E3pdggElIVC2sufcjd2Jc-s,19178
 benchmark_runner/common/clouds/IBM/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/clouds/IBM/ibm_exceptions.py,sha256=psqHgqEBRbfFRWD1blwaWGad-QpThgOl8Puq76VIP80,417
 benchmark_runner/common/clouds/IBM/ibm_operations.py,sha256=ZpF3Vnu2YKqAEYVf7ofBg_kOavMaLCXYCt0CdX8dKd4,3419
@@ -47,7 +47,7 @@ benchmark_runner/common/logger/init_logger.py,sha256=ERa-gNqrl2pZybj7v3csvmao7Mv
 benchmark_runner/common/logger/logger_exceptions.py,sha256=rivdlRm_jIsKQ53rP_-HX8emdtOmQNO4JuIkg8fnBoc,454
 benchmark_runner/common/logger/logger_time_stamp.py,sha256=2JgugN9LpXF4Ijx0wPRzz3DAGJB8eJpM5g1qPvbWbV8,1479
 benchmark_runner/common/oc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-benchmark_runner/common/oc/oc.py,sha256=ht1FpW5QCdFxJkEemwBXzrymIrHDw0RQoEpm5z51MNg,71949
+benchmark_runner/common/oc/oc.py,sha256=uY4kH2ootoaDUf8JSvWzQI2uAvpgVXNYSBSrHLwkX1E,73524
 benchmark_runner/common/oc/oc_exceptions.py,sha256=XfKUzeK3Ors_Y2csQEoGqrlsZlYvq6OXLkFh9s_mQRM,6311
 benchmark_runner/common/oc/singleton_oc_login.py,sha256=OISe7GxN-povQBk1GYVwkdcuEvIbDQP5QImYbNvhX5Y,2395
 benchmark_runner/common/ocp_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -167,15 +167,15 @@ benchmark_runner/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZ
 benchmark_runner/main/main.py,sha256=A744O550wQh37hhk10H0HlT28LZ_2EOaRlJyWG6Pras,14083
 benchmark_runner/main/temporary_environment_variables.py,sha256=ODSHkfhgvdr_b2e3XyvykW21MVjSdyqimREyMc2klRE,957
 benchmark_runner/workloads/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-benchmark_runner/workloads/bootstorm_vm.py,sha256=ZgIiUF3ayMm3FQZwWDUsd8HhjzqCheDJlv_5Puzw4_E,21526
+benchmark_runner/workloads/bootstorm_vm.py,sha256=H55cOHeEIPsb2kxxiXhO0Wuu5wHV0u_61dHbAsvy9VY,21619
 benchmark_runner/workloads/vdbench_pod.py,sha256=feu3lvNumfBCD-An6__xS5Kt9nA50A_-0FmqTXuU9iw,10011
 benchmark_runner/workloads/vdbench_vm.py,sha256=4rRbE-jAbmNrhP-k8F_OREkJ59VfQ7wLrfRQPwDneJg,9786
 benchmark_runner/workloads/windows_vm.py,sha256=qFVD3qBFMnVpYXnrpam-7H5-0Yzvx6qtaEEZx4T-ex4,2415
 benchmark_runner/workloads/workloads.py,sha256=F9fnk4h715tq7ANSCbDH0jktB8fpr_u3YG61Kdi5_os,1422
 benchmark_runner/workloads/workloads_exceptions.py,sha256=u7VII95iPRF_YhfpGH1U1RmgiIYESMOtbSF1dz7_ToE,1858
 benchmark_runner/workloads/workloads_operations.py,sha256=8utD-uU_MNZn5JOC2r5OVq5BfCPkxlUvP3xlUP9oIGk,27160
-benchmark_runner-1.0.827.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.827.dist-info/METADATA,sha256=OohDnC4KbU2jToYnq4GF2dCI3fExiDUp8KAs-uaGQyw,11520
-benchmark_runner-1.0.827.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.827.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.827.dist-info/RECORD,,
+benchmark_runner-1.0.829.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.829.dist-info/METADATA,sha256=hh9R_sn79bTAF1XymlclWHhyyJyc83kPwPVzoy_ASI8,11520
+benchmark_runner-1.0.829.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.829.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.829.dist-info/RECORD,,