benchmark-runner 1.0.729__py3-none-any.whl → 1.0.731__py3-none-any.whl

benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py

@@ -56,6 +56,7 @@ class BareMetalOperations:
         self._ssh = SSH()
         self._cli = self._environment_variables_dict.get('cli', '')
         self._upgrade_ocp_version = self._environment_variables_dict.get('upgrade_ocp_version', '')
+        self._upgrade_channel = self._environment_variables_dict.get('upgrade_channel', '')
 
     def _get_kubeadmin_password(self):
         """
@@ -251,7 +252,7 @@ class BareMetalOperations:
         logger.info(f'Starting OCP upgrade, Start time: {datetime.now().strftime(datetime_format)}')
         logger.info(f'Stop OCP healthcheck')
         oc.healthcheck(action='stop')
-        oc.upgrade_ocp(upgrade_ocp_version=self._upgrade_ocp_version)
+        oc.upgrade_ocp(upgrade_ocp_version=self._upgrade_ocp_version, upgrade_channel=self._upgrade_channel)
         self.verify_upgrade_complete(oc=oc)
         logger.info(f'Resume OCP healthcheck')
         oc.healthcheck(action='resume')

benchmark_runner/common/oc/oc.py

@@ -59,11 +59,12 @@ class OC(SSH):
         # Run the `oc` command to get the ClusterVersion history and extract the previous version
         return self.run(f"{self.__cli} get clusterversion version -o jsonpath='{{.status.history[1].version}}'")
 
-    def upgrade_ocp(self, upgrade_ocp_version: str):
+    def upgrade_ocp(self, upgrade_ocp_version: str, upgrade_channel: str = 'stable'):
         """
         This method upgrades OCP version with conditional handling for specific versions.
 
         @param upgrade_ocp_version: Version to upgrade to
+        @param upgrade_channel: upgrade channel candidate or stable, default stable
         @return:
         """
         ocp_channel = '.'.join(upgrade_ocp_version.split('.')[:2])
@@ -72,8 +73,8 @@ class OC(SSH):
         if ocp_channel == "4.16":
             patch_command = f"{self.__cli} -n openshift-config patch cm admin-acks --patch '{{\"data\":{{\"ack-4.15-kube-1.29-api-removals-in-4.16\":\"true\"}}}}' --type=merge"
             self.run(patch_command)
-
-        upgrade_command = f"{self.__cli} adm upgrade ; sleep 10; {self.__cli} adm upgrade channel stable-{ocp_channel}; sleep 10; {self.__cli} adm upgrade --to={upgrade_ocp_version};"
+        upgrade_command = f"{self.__cli} adm upgrade ; sleep 10; {self.__cli} adm upgrade channel {upgrade_channel}-{ocp_channel}; sleep 10; {self.__cli} adm upgrade --to={upgrade_ocp_version};"
+        logger.info(upgrade_command)
         self.run(upgrade_command)
 
     def upgrade_in_progress(self):

benchmark_runner/common/ocp_resources/create_nhc_snr.py

@@ -26,16 +26,15 @@ class CreateNHCSNR(CreateOCPResourceOperations):
             logger.info(f'run {resource}')
             self.__oc.create_async(yaml=os.path.join(self.__path, resource))
 
-            if '03_subscription.yaml' in resource:
-                # verify once after create all resource files
+            if '03_nhc_subscription.yaml' in resource:
                 self.wait_for_ocp_resource_create(operator='nhc',
                                                   verify_cmd="oc get csv -n openshift-workload-availability -o jsonpath='{.items[0].status.phase}'",
                                                   status='Succeeded')
+            if '04_snr_subscription.yaml' in resource:
                 self.wait_for_ocp_resource_create(operator='snr',
                                                   verify_cmd="oc get csv -n openshift-workload-availability -o jsonpath='{.items[1].status.phase}'",
                                                   status='Succeeded')
-            # SNR is automatically enabled when NHC is enabled
-            if '04_nhc_snr.yaml' in resource:
+            if '05_nhc_snr.yaml' in resource:
                 # Verify NHC is enabled
                 self.wait_for_ocp_resource_create(operator='nhc',
                                                   verify_cmd="oc get nhc -A -o jsonpath='{range .items[*]}{.status.phase}{\"\\n\"}{end}'",

benchmark_runner/common/ocp_resources/nhc_snr/template/04_snr_subscription_template.yaml

@@ -0,0 +1,11 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: self-node-remediation-operator
+  namespace: openshift-workload-availability
+spec:
+  channel: stable
+  installPlanApproval: Automatic
+  name: self-node-remediation
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace

benchmark_runner/main/environment_variables.py

@@ -92,6 +92,8 @@ class EnvironmentVariables:
         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()'

{benchmark_runner-1.0.729.dist-info → benchmark_runner-1.0.731.dist-info}/METADATA

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

{benchmark_runner-1.0.729.dist-info → benchmark_runner-1.0.731.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=S9_ZI0ESASUNWIpQ1WeekjrKBVtVWZDdFoIL0qEC35s,4758
 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=KJrdjPmAidyiLWtqkl2pg7Jo1-ID1tN0feEz1zmT2TM,17590
+benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=a9nZZrPxh01N6fY2aadrHW3_p8L4p5av3SnX9uCYCmU,17721
 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
@@ -46,14 +46,14 @@ 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=eMmMOMCzcipDaOqClQDaC9fLQMK2UfCr0XXg9yjtBDE,67578
+benchmark_runner/common/oc/oc.py,sha256=-ta6Z9H4D0GMX2mNt83M_j6Lr3u_7CgeBB2I_PyQcDs,67742
 benchmark_runner/common/oc/oc_exceptions.py,sha256=4JDebyFqe6yIN6Y70E-oscWnme0t7Ggg_CJBBoOuFPs,6336
 benchmark_runner/common/ocp_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/ocp_resources/create_cnv.py,sha256=AXsyR8_g_RIFHz2rkyHzzvvUDIiGdOi9rZWJPhiPzDQ,3511
 benchmark_runner/common/ocp_resources/create_custom.py,sha256=rthm96yDzI-Hke54hLWTs0O3gDtpQPR6n184ehaEevo,1029
 benchmark_runner/common/ocp_resources/create_kata.py,sha256=IhfnDHj0lLUVENA-Nh9BucSAt0BqL8mtqT6QloMzIDg,3721
 benchmark_runner/common/ocp_resources/create_lso.py,sha256=anrLu2NymdxE7LkJ9fytqmhkysq7hVLOYBVxjfFlmVE,1634
-benchmark_runner/common/ocp_resources/create_nhc_snr.py,sha256=pTyx6Y5BNfXvRtJcbfLtUlqdEb1eB7ypCFv9-kBEIuU,2057
+benchmark_runner/common/ocp_resources/create_nhc_snr.py,sha256=ejbX-KhkvqU9SCEX1-tA7xiZRXe5bsSAQoyyjMC15IU,1991
 benchmark_runner/common/ocp_resources/create_ocp_resource.py,sha256=ik0lotwiuECRDCbPYfDpi2Q_qjhtc2XDCR9zbY_Z9V0,5504
 benchmark_runner/common/ocp_resources/create_ocp_resource_exceptions.py,sha256=hthowyHAeg66IZHYPe1FWU3dnhwXcQtPBrOQSO1RZMU,941
 benchmark_runner/common/ocp_resources/create_ocp_resource_operations.py,sha256=47SyVjtv5e9vKuRQFlC-VfGKXBLEl46rut4XVeZRsMo,6834
@@ -73,8 +73,9 @@ benchmark_runner/common/ocp_resources/lso/template/03_catalogsource_template.yam
 benchmark_runner/common/ocp_resources/lso/template/04_subscription_template.yaml,sha256=n3D8CYQBNOIzdjwuSFXVxWuuR_HW5uvA0oP69ORHLIM,413
 benchmark_runner/common/ocp_resources/nhc_snr/template/01_namespace_template.yaml,sha256=nOhhszaaJ0FAS8ke8DgGHXaa-hPqDoWRFyK1fSJkUVA,81
 benchmark_runner/common/ocp_resources/nhc_snr/template/02_operator_group_template.yaml,sha256=WM4DWIcADQ7QhRSGMOG58GDo7bWBwFKDMFqKhv3oPWE,156
-benchmark_runner/common/ocp_resources/nhc_snr/template/03_subscription_template.yaml,sha256=fPBon9WfLYbRMZKC4DIBrnaDxAT1GwDvzvbiHhoSJn0,314
-benchmark_runner/common/ocp_resources/nhc_snr/template/04_nhc_snr_template.yaml,sha256=Z7_yCYvo0S40MykQp5ygUrZ8MkZooyfTPgo_9TdTZlQ,1069
+benchmark_runner/common/ocp_resources/nhc_snr/template/03_nhc_subscription_template.yaml,sha256=fPBon9WfLYbRMZKC4DIBrnaDxAT1GwDvzvbiHhoSJn0,314
+benchmark_runner/common/ocp_resources/nhc_snr/template/04_snr_subscription_template.yaml,sha256=gpcEbR7msWnYwzENiBs-Raw7Yf3QGrVPrfPLkVqcoPw,310
+benchmark_runner/common/ocp_resources/nhc_snr/template/05_nhc_snr_template.yaml,sha256=Z7_yCYvo0S40MykQp5ygUrZ8MkZooyfTPgo_9TdTZlQ,1069
 benchmark_runner/common/ocp_resources/odf/template/01_delete_disks_template.sh,sha256=NaPyYa8777IGa6SPvWSw_gCKBIt6yTHLEFWS-Yo3EJk,174
 benchmark_runner/common/ocp_resources/odf/template/02_label_nodes_template.sh,sha256=P4O_3zud56UuVbYgBRGlm4nh9m4Ju9jfZ2YIoKloaEE,206
 benchmark_runner/common/ocp_resources/odf/template/03_local_volume_discovery_template.yaml,sha256=WjZekDSj-1x8xpL85EY-6dUUCW-nkmb9GP6NyePIhBU,347
@@ -159,7 +160,7 @@ 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=-4ZJCC6lHmv777xXp_0W4X7KAbZZ183N9qwoFyBVhCQ,27974
+benchmark_runner/main/environment_variables.py,sha256=0qXRMe4ZkIle1mf-C4B30V0ey5JC9R5M1Aa-Jbagpqg,28126
 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
@@ -171,8 +172,8 @@ benchmark_runner/workloads/windows_vm.py,sha256=eHK79ueAkSlNC1uamz19o7CO20wzJi-U
 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.729.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.729.dist-info/METADATA,sha256=GmfTAJ6wee6umRsDvFvrGwj-6sBmX9LcwkPgGJxGsxY,11498
-benchmark_runner-1.0.729.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-benchmark_runner-1.0.729.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.729.dist-info/RECORD,,
+benchmark_runner-1.0.731.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.731.dist-info/METADATA,sha256=TMeuBTt4K0VZYgVYSe1PmeXgb6CjoVlTAcexDM8RcTA,11498
+benchmark_runner-1.0.731.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+benchmark_runner-1.0.731.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.731.dist-info/RECORD,,