benchmark-runner 1.0.794__py3-none-any.whl → 1.0.795__py3-none-any.whl

benchmark_runner/common/oc/oc.py

@@ -1559,3 +1559,17 @@ class OC(SSH):
                 except Exception as remove_error:
                     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 save_to_yaml(self, vm_name, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
+        """
+        This method save pod and vm into yaml per namespace
+        :param vm_name:
+        :param namespace:
+        :param output_dir:
+        :return:
+        """
+        self.run(f"oc get vmi {vm_name} -n {namespace} -o yaml > '{output_dir}/{vm_name}.yaml'")
+        pod_name = self.run(
+            f'oc get pod -n {namespace} -o jsonpath="{{.items[?(@.metadata.generateName==\'virt-launcher-{vm_name}-\')].metadata.name}}"'
+        )
+        self.run(f"oc get pod {pod_name} -n {namespace} -o yaml > '{output_dir}/{pod_name}.yaml'")

benchmark_runner/workloads/bootstorm_vm.py

@@ -123,15 +123,15 @@ class BootstormVM(WorkloadsOperations):
                 self._data_dict.update(self._prometheus_result)
             total_run_time = self._get_bootstorm_vm_total_run_time()
             self._data_dict.update({'total_run_time': total_run_time})
-        # Google drive run_artifacts_url folder path
-        if self._google_drive_path and self.get_run_artifacts_google_drive():
-            self._data_dict.update({'run_artifacts_url': self.get_run_artifacts_google_drive()})
-        if self._es_host:
-            # upload several run results
-            self._upload_to_elasticsearch(index=self._es_index, kind=self._kind, status=self._status,
-                                          result=self._data_dict)
-            # verify that data upload to elastic search according to unique uuid
-            self._verify_elasticsearch_data_uploaded(index=self._es_index, uuid=self._uuid)
+            # Google drive run_artifacts_url folder path
+            if self._google_drive_path and self.get_run_artifacts_google_drive():
+                self._data_dict.update({'run_artifacts_url': self.get_run_artifacts_google_drive()})
+            if self._es_host:
+                # upload several run results
+                self._upload_to_elasticsearch(index=self._es_index, kind=self._kind, status=self._status,
+                                              result=self._data_dict)
+                # verify that data upload to elastic search according to unique uuid
+                self._verify_elasticsearch_data_uploaded(index=self._es_index, uuid=self._uuid)
 
     def _run_vm(self):
         """
@@ -218,6 +218,7 @@ class BootstormVM(WorkloadsOperations):
         :param return_dict:
         :return:
         """
+        self._oc.save_to_yaml(vm_name, output_dir=self._run_artifacts_path)
         status = self._verify_single_vm(vm_name)
         return_dict[vm_name] = status
 
@@ -289,17 +290,21 @@ class BootstormVM(WorkloadsOperations):
                                                       cnv_version=self._cnv_version)
                     self._oc.generate_odf_must_gather(destination_path=self._run_artifacts_path,
                                                       odf_version=self._odf_version)
-                    # Upload artifacts
-                    if self._google_drive_shared_drive_id:
-                        self.upload_run_artifacts_to_google_drive()
-                    elif self._endpoint_url and not self._google_drive_shared_drive_id:
-                        self.upload_run_artifacts_to_s3()
-                    else:
-                        self._save_artifacts_local = True
-
                     # 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)}")
+                    logger.error(f"Failed to verify virtctl SSH login for the following VMs: {', '.join(failure_vms)}")
+                # Upload artifacts
+                if self._google_drive_shared_drive_id:
+                    self.upload_run_artifacts_to_google_drive()
+                elif self._endpoint_url and not self._google_drive_shared_drive_id:
+                    self.upload_run_artifacts_to_s3()
+                else:
+                    self._save_artifacts_local = True
+                if self._es_host:
+                    self._data_dict.update({'run_artifacts_url': self.get_run_artifacts_google_drive()})
+                    # upload several run results
+                    self._upload_to_elasticsearch(index=self._es_index, kind=self._kind, status=self._status,result=self._data_dict)
+                    # verify that data upload to elastic search according to unique uuid
+                    self._verify_elasticsearch_data_uploaded(index=self._es_index, uuid=self._uuid)
 
             except Exception as err:
                 # Save run artifacts logs

{benchmark_runner-1.0.794.dist-info → benchmark_runner-1.0.795.dist-info}/METADATA

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

{benchmark_runner-1.0.794.dist-info → benchmark_runner-1.0.795.dist-info}/RECORD

@@ -46,7 +46,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=jtKqmUDCaqRA90utzKDVENXQASSdBNYV03CiBOwHuuE,68864
+benchmark_runner/common/oc/oc.py,sha256=m0fUSau6RhZlKLT8HY2D-RpH1Q2GVFzuXsMNW98AjTI,69552
 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
@@ -166,15 +166,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=ykpr__vdOPssp1E6Z3kGWuJbPhgLFMlWR7-ZdYy9ISY,20084
+benchmark_runner/workloads/bootstorm_vm.py,sha256=B30o-9ZHGR5qZT_xhPTNAbF6GDXmlHnL8GBqjisNJks,20652
 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=TDUcCClR6P1h7fuyIpelMx5-vmruHzRd9c6Nb0Ggj7s,25369
-benchmark_runner-1.0.794.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.794.dist-info/METADATA,sha256=wboK-Qs2GQ20TqaEgSiLJV1bAvF-vZB63D0hCXECdXI,11520
-benchmark_runner-1.0.794.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-benchmark_runner-1.0.794.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.794.dist-info/RECORD,,
+benchmark_runner-1.0.795.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.795.dist-info/METADATA,sha256=TBnV1bwujyB1RK4aqhO67ZPGgDZr9tuk_mxI519mLdM,11520
+benchmark_runner-1.0.795.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+benchmark_runner-1.0.795.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.795.dist-info/RECORD,,

{benchmark_runner-1.0.794.dist-info → benchmark_runner-1.0.795.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any