benchmark-runner 1.0.864__tar.gz → 1.0.866__tar.gz

{benchmark_runner-1.0.864/benchmark_runner.egg-info → benchmark_runner-1.0.866}/PKG-INFO

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

{benchmark_runner-1.0.864 → benchmark_runner-1.0.866}/benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py

@@ -119,7 +119,7 @@ class BareMetalOperations:
             return True
         else:
             if self._must_gather_log:
-                oc.generate_must_gather(destination_path=self._run_artifacts_path)
+                oc.generate_ocp_must_gather(destination_path=self._run_artifacts_path)
             raise OCPUpgradeFailed(status=oc.get_cluster_status())
 
     def _install_ocp_cmd(self):

{benchmark_runner-1.0.864 → benchmark_runner-1.0.866}/benchmark_runner/common/oc/oc.py

@@ -52,6 +52,10 @@ class OC(SSH):
         else:
             self._kubeadmin_password = self.__environment_variables_dict.get('kubeadmin_password', '')
         self._kubeconfig_path = self.__environment_variables_dict.get('kubeconfig_path', '')
+        self._must_gather_log = self.__environment_variables_dict.get('must_gather_log', '')
+        self._run_artifacts_path = self.__environment_variables_dict.get('run_artifacts_path', '')
+        self._cnv_version = self.__environment_variables_dict.get('cnv_version', '')
+        self._odf_version = self.__environment_variables_dict.get('odf_version', '')
         # Singleton Login class
         SingletonOCLogin(self)
 
@@ -548,6 +552,9 @@ class OC(SSH):
             time.sleep(wait_time)
             current_wait_time += wait_time
         logger.info(f"oc get nodes:\n{self.run('oc get nodes')}")
+        if self._must_gather_log:
+            self.generate_must_gather(run_artifacts_path=self._run_artifacts_path, cnv_version=self._cnv_version,
+                                          odf_version=self._odf_version)
         raise NodeNotReady(nodes_status=nodes_status)
 
     @typechecked
@@ -1554,7 +1561,7 @@ class OC(SSH):
 
     @typechecked
     @logger_time_stamp
-    def generate_must_gather(self, destination_path: str = '/tmp'):
+    def generate_ocp_must_gather(self, destination_path: str = '/tmp'):
         """
         Generates OpenShift must-gather and stores it in the destination path.
 
@@ -1636,6 +1643,14 @@ class OC(SSH):
                     raise RuntimeError(f"Failed to remove folder {folder_path}: {remove_error}")
             raise RuntimeError(f"Failed to generate CNV must-gather logs for version {cnv_version}: {e}")
 
+    def generate_must_gather(self, run_artifacts_path, cnv_version, odf_version):
+        """
+        This method generates must gather and saves it in the run artifacts path
+        """
+        self.generate_ocp_must_gather(destination_path=run_artifacts_path)
+        self.generate_cnv_must_gather(destination_path=run_artifacts_path, cnv_version=cnv_version)
+        self.generate_odf_must_gather(destination_path=run_artifacts_path, odf_version=odf_version)
+
     def save_to_yaml(self, vm_name, vm_access, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
         """
         This method save pod and vm into yaml per namespace

{benchmark_runner-1.0.864 → benchmark_runner-1.0.866}/benchmark_runner/workloads/bootstorm_vm.py

@@ -304,9 +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)
+                    self._oc.generate_must_gather(destination_path=self._run_artifacts_path, cnv_version=self._cnv_version, odf_version=self._odf_version)
                 # Error log with details of failed VM, for catching all vm errors
                 logger.error(f"Failed to verify virtctl SSH login for the following VMs: {', '.join(failure_vms)}")
             # Upload artifacts in validation

{benchmark_runner-1.0.864 → benchmark_runner-1.0.866/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.864 → benchmark_runner-1.0.866}/setup.py

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