benchmark-runner 1.0.735__py3-none-any.whl → 1.0.737__py3-none-any.whl

benchmark_runner/main/environment_variables.py

@@ -90,10 +90,6 @@ class EnvironmentVariables:
         self._environment_variables_dict['run_strategy'] = EnvironmentVariables.get_boolean_from_environment('RUN_STRATEGY', False)
         # Verification only, without running or deleting any resources, default False
         self._environment_variables_dict['verification_only'] = EnvironmentVariables.get_boolean_from_environment('VERIFICATION_ONLY', False)
-        # Verification while upgrade, e.g. 4.15.23
-        self._environment_variables_dict['wait_for_upgrade_version'] = EnvironmentVariables.get_env('WAIT_FOR_UPGRADE_VERSION', '')
-        # candidate/ stable (default)
-        self._environment_variables_dict['upgrade_channel'] = EnvironmentVariables.get_env('UPGRADE_CHANNEL', '')
 
         # default parameter - change only if needed
         # Parameters below related to 'run_workload()'
@@ -233,6 +229,8 @@ class EnvironmentVariables:
         self._environment_variables_dict['upgrade_ocp_version'] = EnvironmentVariables.get_env('UPGRADE_OCP_VERSION','')
         # There are 2 options: run_bare_metal_ocp_upgrade/ verify_bare_metal_upgrade_complete
         self._environment_variables_dict['upgrade_step'] = EnvironmentVariables.get_env('UPGRADE_STEP', '')
+        # candidate/ stable (default)
+        self._environment_variables_dict['upgrade_channel'] = EnvironmentVariables.get_env('UPGRADE_CHANNEL', '')
 
         # SNO or empty for regular
         self._environment_variables_dict['cluster_type'] = EnvironmentVariables.get_env('CLUSTER_TYPE', '')

benchmark_runner/workloads/bootstorm_vm.py

@@ -216,8 +216,8 @@ class BootstormVM(WorkloadsOperations):
             failure = False
             failure_vms = []  # List to store failed VM names
 
-            if self._wait_for_upgrade_version:
-                upgrade_done = self._oc.get_cluster_status() == f'Cluster version is {self._wait_for_upgrade_version}'
+            if self._upgrade_ocp_version:
+                upgrade_done = self._oc.get_cluster_status() == f'Cluster version is {self._upgrade_ocp_version}'
                 current_wait_time = 0
 
                 while (self._timeout <= 0 or current_wait_time <= self._timeout) and not upgrade_done:
@@ -227,13 +227,13 @@ class BootstormVM(WorkloadsOperations):
                             failure = True
                             if vm_name not in failure_vms:
                                 failure_vms.append(vm_name)
-                    upgrade_done = self._oc.get_cluster_status() == f'Cluster version is {self._wait_for_upgrade_version}'
+                    upgrade_done = self._oc.get_cluster_status() == f'Cluster version is {self._upgrade_ocp_version}'
 
                     # Sleep 1 sec between each cycle
                     time.sleep(1)
                     current_wait_time += 1  # Increment the wait time
             else:
-                # If _wait_for_upgrade_version is empty, verify VM SSH without waiting for upgrade
+                # If _upgrade_ocp_version is empty, verify VM SSH without waiting for upgrade
                 for vm_name in vm_names:
                     virtctl_status = self._verify_single_vm(vm_name)
                     if virtctl_status != 'True':
@@ -241,8 +241,8 @@ class BootstormVM(WorkloadsOperations):
                         if vm_name not in failure_vms:
                             failure_vms.append(vm_name)
 
-            if self._wait_for_upgrade_version:
-                logger.info(f'Cluster is upgraded to: {self._wait_for_upgrade_version}')
+            if self._upgrade_ocp_version:
+                logger.info(f'Cluster is upgraded to: {self._upgrade_ocp_version}')
 
             if failure:
                 self._oc.generate_cnv_must_gather(destination_path=self._run_artifacts_path,
@@ -257,8 +257,8 @@ class BootstormVM(WorkloadsOperations):
                 else:
                     self._save_artifacts_local = True
 
-                # Raise an error with details of failed VMs
-                raise RuntimeError(
+                # 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)}")
 
         except Exception as err:

benchmark_runner/workloads/workloads_operations.py

@@ -104,7 +104,6 @@ class WorkloadsOperations:
         self._windows_url = self._environment_variables_dict.get('windows_url', '')
         self._delete_all = self._environment_variables_dict.get('delete_all', '')
         self._verification_only = self._environment_variables_dict.get('verification_only', '')
-        self._wait_for_upgrade_version = self._environment_variables_dict.get('wait_for_upgrade_version', '')
         if self._windows_url:
             file_name = os.path.basename(self._windows_url)
             self._windows_os = os.path.splitext(file_name)[0]

{benchmark_runner-1.0.735.dist-info → benchmark_runner-1.0.737.dist-info}/METADATA

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

{benchmark_runner-1.0.735.dist-info → benchmark_runner-1.0.737.dist-info}/RECORD

@@ -160,20 +160,20 @@ benchmark_runner/krkn_hub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 benchmark_runner/krkn_hub/krknhub_exceptions.py,sha256=Hk7Co6zZ0u2RSmBmS4ZAi21ffZaQ2ITTfl6tGLtiAdY,180
 benchmark_runner/krkn_hub/krknhub_workloads.py,sha256=qNRZA-FBQZiT6h013WbP6zBRINh3c6YMnnlksN9fssA,2851
 benchmark_runner/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-benchmark_runner/main/environment_variables.py,sha256=0qXRMe4ZkIle1mf-C4B30V0ey5JC9R5M1Aa-Jbagpqg,28126
+benchmark_runner/main/environment_variables.py,sha256=v5otuj0Pdz5rViHbqD4ezh32JQAIiu5-pN9LQkzuMs8,27943
 benchmark_runner/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZdJRlRq8ZUTt0h8jFvUtrnP4m4AIY,437
 benchmark_runner/main/main.py,sha256=SB-rD4U_978gP8ojGUtIsYzhSsmzeEDsUfOiJQJdz9c,14097
 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=V2E7D95V7B88llc8tif_E0ZEmy5tJSmuH_8XHSc5Z5s,18495
+benchmark_runner/workloads/bootstorm_vm.py,sha256=EVECP0sfu43ievbyU4DDlkb2iMqE_Tym5LhaI_ahevI,18481
 benchmark_runner/workloads/vdbench_pod.py,sha256=OcmxVr5QlbkhAgY37wsZ7xJUjs9HI-qMVDex1HdL2P0,9778
 benchmark_runner/workloads/vdbench_vm.py,sha256=Yhoz-GbvZwA8q6qGIeSUsYhEIERj8SmJB1yjetwsGow,9449
 benchmark_runner/workloads/windows_vm.py,sha256=eHK79ueAkSlNC1uamz19o7CO20wzJi-UIqRuTByTVxg,2373
 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=zhMAL-Zc2JtdI-LG4kxGwbGwHaLY2DfklpzM4bBG-eo,25261
-benchmark_runner-1.0.735.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.735.dist-info/METADATA,sha256=A7a7e9RaUTEYDtf4Ypa8bQ6xH55phuvpgjktU6Pl4q8,11498
-benchmark_runner-1.0.735.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-benchmark_runner-1.0.735.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.735.dist-info/RECORD,,
+benchmark_runner/workloads/workloads_operations.py,sha256=O2iJItJ73G6l_uA3trCvXhcxvY1SPf4dvYg4RLXbhUA,25151
+benchmark_runner-1.0.737.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.737.dist-info/METADATA,sha256=SfE8S-F9OQTHZJZF5u6hPQNjGt4FFu7zsAPaL5CiCrY,11498
+benchmark_runner-1.0.737.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+benchmark_runner-1.0.737.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.737.dist-info/RECORD,,