benchmark-runner 1.0.787__py3-none-any.whl → 1.0.788__py3-none-any.whl

benchmark_runner/workloads/workloads_operations.py

@@ -17,7 +17,7 @@ from benchmark_runner.common.clouds.shared.s3.s3_operations import S3Operations
 from benchmark_runner.common.prometheus.prometheus_snapshot import PrometheusSnapshot
 from benchmark_runner.common.prometheus.prometheus_snapshot_exceptions import PrometheusSnapshotError
 from benchmark_runner.common.template_operations.template_operations import TemplateOperations
-from benchmark_runner.common.clouds.IBM.ibm_operations import IBMOperations
+from benchmark_runner.common.clouds.BareMetal.bare_metal_operations import BareMetalOperations
 from benchmark_runner.common.prometheus.prometheus_metrics_operations import PrometheusMetricsOperation
 from benchmark_runner.common.google_drive.google_drive_operations import GoogleDriveOperations
 
@@ -390,7 +390,7 @@ class WorkloadsOperations:
         """
         date_format = '%Y_%m_%d'
         metadata = {'ocp_version': self._oc.get_ocp_server_version(),
-                    'previous_ocp_version': self._oc.get_previous_ocp_version() if self._upgrade_ocp_version else '',
+                    'previous_ocp_version': '' if len(self._oc.get_previous_ocp_version()) > 10 else self._oc.get_previous_ocp_version(),
                     'cnv_version': self._oc.get_cnv_version(),
                     'kata_version': self._oc.get_kata_operator_version(),
                     'kata_rpm_version': self._oc.get_kata_rpm_version(node=self._pin_node1),
@@ -455,15 +455,15 @@ class WorkloadsOperations:
         """
         if self._run_type == 'test_ci':
             es_index = 'ci-status-test'
+        elif self._run_type == 'chaos_ci':
+            es_index = 'ci-status-chaos'
         else:
             es_index = 'ci-status'
         status_dict = {'failed': 0, 'pass': 1}
         metadata = self.__get_metadata()
         if ocp_resource_install_minutes_time != 0:
-            ibm_operations = IBMOperations(user=self._environment_variables_dict.get('provision_user', ''))
-            ibm_operations.ibm_connect()
-            ocp_install_minutes_time = ibm_operations.get_ocp_install_time()
-            ibm_operations.ibm_disconnect()
+            bm_operations = BareMetalOperations(user=self._environment_variables_dict.get('provision_user', ''))
+            ocp_install_minutes_time = bm_operations.get_ocp_install_time()
         metadata.update({'status': status, 'status#': status_dict[status], 'ci_minutes_time': ci_minutes_time, 'benchmark_runner_id': benchmark_runner_id, 'benchmark_operator_id': benchmark_operator_id, 'benchmark_wrapper_id': benchmark_wrapper_id, 'ocp_install_minutes_time': ocp_install_minutes_time, 'ocp_resource_install_minutes_time': ocp_resource_install_minutes_time})
         self._es_operations.upload_to_elasticsearch(index=es_index, data=metadata)
 

{benchmark_runner-1.0.787.dist-info → benchmark_runner-1.0.788.dist-info}/METADATA

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

{benchmark_runner-1.0.787.dist-info → benchmark_runner-1.0.788.dist-info}/RECORD

@@ -172,9 +172,9 @@ benchmark_runner/workloads/vdbench_vm.py,sha256=Yhoz-GbvZwA8q6qGIeSUsYhEIERj8SmJ
 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=EEIZjNYGjEkyUafxFKSu4X9jaN_wgYDbMeCi1hZBZ-0,25186
-benchmark_runner-1.0.787.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.787.dist-info/METADATA,sha256=bsMnUcGVMnQTr5F5Uqf2drMDe5VgSKiozbvu585JRLA,11520
-benchmark_runner-1.0.787.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-benchmark_runner-1.0.787.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.787.dist-info/RECORD,,
+benchmark_runner/workloads/workloads_operations.py,sha256=DtnlJKvJTlswKS6Xem4eA9rfIyUr1tMdJWz7qThgAPI,25228
+benchmark_runner-1.0.788.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.788.dist-info/METADATA,sha256=uV4TawdMrVct8rjfXi8dYGMqtJDmo0To10vGE_L_qS0,11520
+benchmark_runner-1.0.788.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+benchmark_runner-1.0.788.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.788.dist-info/RECORD,,