benchmark-runner 1.0.794__tar.gz → 1.0.796__tar.gz

{benchmark_runner-1.0.794/benchmark_runner.egg-info → benchmark_runner-1.0.796}/PKG-INFO

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

{benchmark_runner-1.0.794 → benchmark_runner-1.0.796}/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-1.0.794 → benchmark_runner-1.0.796}/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 → benchmark_runner-1.0.796/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.794 → benchmark_runner-1.0.796}/setup.py

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