benchmark-runner 1.0.864__py3-none-any.whl → 1.0.866__py3-none-any.whl

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/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/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.dist-info → benchmark_runner-1.0.866.dist-info}/METADATA

@@ -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.dist-info → benchmark_runner-1.0.866.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=17lTO7myBiqOcvDx8fxypDNosmnQVoeX95B7vAkcXH8,19627
+benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=rvw818kc3r1bcE4T1g8IppdKgA732yaCuN5cUQ9uYMY,19631
 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=sYWn4PSYz5HbZBr-rIXvb0A_yMbqE-Xg7RDeGkCeepk,74756
+benchmark_runner/common/oc/oc.py,sha256=UAHEo6L5oFeTNguiFVuHtMXuGOE9W9ox5We8NetSiLk,75806
 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=mVEn8ZDdfZ8deyCA2YEwL0K-oZA5CJIfF5mrpbDDjLo,21758
+benchmark_runner/workloads/bootstorm_vm.py,sha256=GsypprQm_PVEr5lvFnhfNzKEjbsTniQY8DdlDmxQbfs,21564
 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=Z7cT5rrLmz_SEIbtxbxyniaA0dQ07s8nK1I2EWcoBqM,27378
-benchmark_runner-1.0.864.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.864.dist-info/METADATA,sha256=WoQQwnfKnQ2tiFtRzcVCjJkQNxtLm7eoRfV8kfnAOQw,11582
-benchmark_runner-1.0.864.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.864.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.864.dist-info/RECORD,,
+benchmark_runner-1.0.866.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.866.dist-info/METADATA,sha256=d82qAwFn6ruGF7vV3L6WHZKkt4u245N9w-3hRs91AKs,11582
+benchmark_runner-1.0.866.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.866.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.866.dist-info/RECORD,,