benchmark-runner 1.0.828__tar.gz → 1.0.830__tar.gz

{benchmark_runner-1.0.828/benchmark_runner.egg-info → benchmark_runner-1.0.830}/PKG-INFO

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

{benchmark_runner-1.0.828 → benchmark_runner-1.0.830}/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', '')
@@ -116,6 +118,8 @@ class BareMetalOperations:
             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-1.0.828 → benchmark_runner-1.0.830}/benchmark_runner/common/oc/oc.py

@@ -89,8 +89,9 @@ class OC(SSH):
         @param upgrade_channel: upgrade channel candidate or stable, default stable
         @return:
         """
+        # default stable
+        upgrade_channel = upgrade_channel or 'stable'
         ocp_channel = '.'.join(upgrade_ocp_version.split('.')[:2])
-
         # see: https://access.redhat.com/articles/7031404
         if ocp_channel == "4.16":
             patch_command = f"{self._cli} -n openshift-config patch cm admin-acks --patch '{{\"data\":{{\"ack-4.15-kube-1.29-api-removals-in-4.16\":\"true\"}}}}' --type=merge"
@@ -101,38 +102,37 @@ class OC(SSH):
 
     def upgrade_in_progress(self):
         """
-        This method returns True if an upgrade is in progress and False otherwise, with retries on transient failures.
-        @return: bool
+        Checks whether an OpenShift upgrade is in progress by inspecting the 'Progressing' status condition.
+        Retries on transient failures.
+
+        @return: bool - True if upgrade is in progress, False otherwise.
         """
         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()
+                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'
+
+        return False
 
     @logger_time_stamp
     def wait_for_ocp_upgrade_start(self, upgrade_version: str, timeout: int = SHORT_TIMEOUT):
         """
-        This method waits for ocp upgrade to start
-        :param upgrade_version:
-        :param timeout:
-        :return:
+        This method waits for the OCP upgrade to start.
+        :param upgrade_version: The target OCP version.
+        :param timeout: Timeout in seconds (waits indefinitely if <= 0).
+        :return: True if upgrade starts within timeout, else raises UpgradeNotStartTimeout.
         """
         current_wait_time = 0
-        while timeout <= 0 or current_wait_time <= timeout and not self.upgrade_in_progress():
-            # sleep for x seconds
+        while timeout <= 0 or current_wait_time <= timeout:
+            if self.upgrade_in_progress():
+                return True
             time.sleep(OC.SLEEP_TIME)
             current_wait_time += OC.SLEEP_TIME
+
+        # Final check after timeout
         if self.upgrade_in_progress():
             return True
         else:
@@ -1534,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-1.0.828 → benchmark_runner-1.0.830}/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.828 → benchmark_runner-1.0.830/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.828 → benchmark_runner-1.0.830}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.828'  # update also .bumpversion.cfg
+__version__ = '1.0.830'  # update also .bumpversion.cfg
 
 
 here = path.abspath(path.dirname(__file__))