benchmark-runner 1.0.740__py3-none-any.whl → 1.0.742__py3-none-any.whl

benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py

@@ -23,16 +23,10 @@ class BareMetalOperations:
     SHORT_TIMEOUT = 600
 
     @typechecked
-    def __init__(self, user: str):
+    def __init__(self, user: str = None):
         self._environment_variables_dict = environment_variables.environment_variables_dict
-        self._user = user
         self._ocp_env_flavor = self._environment_variables_dict.get('ocp_env_flavor', '')
         self._create_pod_ci_cmd = self._environment_variables_dict.get('create_pod_ci_cmd', '')
-        self._provision_kubeadmin_password_path = self._environment_variables_dict.get('provision_kubeadmin_password_path', '')
-        self._provision_kubeconfig_path = self._environment_variables_dict.get('provision_kubeconfig_path', '')
-        self._provision_installer_path = self._environment_variables_dict.get('provision_installer_path', '')
-        self._provision_installer_cmd = self._environment_variables_dict.get('provision_installer_cmd', '')
-        self._provision_installer_log = self._environment_variables_dict.get('provision_installer_log', '')
         self._install_ocp_version = self._environment_variables_dict.get('install_ocp_version', '')
         self._cluster_type = self._environment_variables_dict.get('cluster_type', '')
         self._expected_nodes = self._environment_variables_dict.get('expected_nodes', '')
@@ -41,22 +35,30 @@ class BareMetalOperations:
             self._expected_nodes = ast.literal_eval(self._expected_nodes)
         self._ocp_version_build = self._environment_variables_dict.get('ocp_version_build', '')
         self._num_odf_disks = int(self._environment_variables_dict.get('num_odf_disk', 1))
-        self._provision_ip = self._environment_variables_dict.get('provision_ip', '')
-        self._provision_port = int(self._environment_variables_dict.get('provision_port', ''))
-        self._provision_timeout = int(self._environment_variables_dict.get('provision_timeout', ''))
-        self._container_private_key_path = self._environment_variables_dict.get('container_private_key_path', '')
-        self._connection_data = ConnectionData(host_name=self._provision_ip,
-                                                user_name=self._user,
-                                                port=self._provision_port,
-                                                timeout=self._provision_timeout,
-                                                ssh_key=self._container_private_key_path)
-        self._remote_ssh = RemoteSsh(self._connection_data)
-        if self._environment_variables_dict.get('github_repository_short', ''):
-            self._github_operations = GitHubOperations()
         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', '')
+        self._timeout = int(self._environment_variables_dict.get('timeout', ''))
+        if user:
+            self._user = user
+            self._provision_kubeadmin_password_path = self._environment_variables_dict.get('provision_kubeadmin_password_path', '')
+            self._provision_kubeconfig_path = self._environment_variables_dict.get('provision_kubeconfig_path', '')
+            self._provision_installer_path = self._environment_variables_dict.get('provision_installer_path', '')
+            self._provision_installer_cmd = self._environment_variables_dict.get('provision_installer_cmd', '')
+            self._provision_installer_log = self._environment_variables_dict.get('provision_installer_log', '')
+            self._provision_ip = self._environment_variables_dict.get('provision_ip', '')
+            self._provision_port = int(self._environment_variables_dict.get('provision_port', ''))
+            self._provision_timeout = int(self._environment_variables_dict.get('provision_timeout', ''))
+            self._container_private_key_path = self._environment_variables_dict.get('container_private_key_path', '')
+            self._connection_data = ConnectionData(host_name=self._provision_ip,
+                                                    user_name=self._user,
+                                                    port=self._provision_port,
+                                                    timeout=self._provision_timeout,
+                                                    ssh_key=self._container_private_key_path)
+            self._remote_ssh = RemoteSsh(self._connection_data)
+            if self._environment_variables_dict.get('github_repository_short', ''):
+                self._github_operations = GitHubOperations()
 
     def _get_kubeadmin_password(self):
         """
@@ -103,7 +105,7 @@ class BareMetalOperations:
         current_wait_time = 0
         logger.info(f'Waiting until the upgrade to version {self._upgrade_ocp_version} starts...')
         oc.wait_for_ocp_upgrade_start(upgrade_version=self._upgrade_ocp_version)
-        while self._provision_timeout <= 0 or current_wait_time <= self._provision_timeout and oc.upgrade_in_progress():
+        while self._timeout <= 0 or current_wait_time <= self._timeout and oc.upgrade_in_progress():
             logger.info(f'Waiting till OCP upgrade complete, waiting {int(current_wait_time / 60)} minutes')
             # sleep for x seconds
             time.sleep(sleep_time)
@@ -302,12 +304,16 @@ class BareMetalOperations:
         raise OCPUpgradeFailed(status=oc.get_cluster_status())
 
     @logger_time_stamp
-    def oc_login(self):
+    def oc_login(self, kubeadmin_password: str):
         """
         This method login to the cluster with new credentials
+        :param kubeadmin_password
         :return:
         """
-        oc = OC(kubeadmin_password=self._get_kubeadmin_password())
+        if kubeadmin_password:
+            oc = OC(kubeadmin_password=kubeadmin_password)
+        else:
+            oc = OC(kubeadmin_password=self._get_kubeadmin_password())
         oc.login()
         return oc
 

benchmark_runner/common/oc/oc.py

@@ -33,7 +33,6 @@ class OC(SSH):
 
     def __init__(self, kubeadmin_password: str = ''):
         super().__init__()
-        self.__kubeadmin_password = kubeadmin_password
         self.__environment_variables_dict = environment_variables.environment_variables_dict
         self._run_artifacts = self.__environment_variables_dict.get('run_artifacts_path', '')
         self.__elasticsearch_url = self.__environment_variables_dict.get('elasticsearch_url', '')
@@ -43,6 +42,10 @@ class OC(SSH):
         self.__worker_disk_ids = self.__environment_variables_dict.get('worker_disk_ids', '')
         if self.__worker_disk_ids:
             self.__worker_disk_ids = ast.literal_eval(self.__worker_disk_ids)
+        if kubeadmin_password:
+            self.__kubeadmin_password = kubeadmin_password
+        else:
+            self.__kubeadmin_password = self.__environment_variables_dict.get('kubeadmin_password', '')
 
     def get_ocp_server_version(self):
         """

benchmark_runner/main/main.py

@@ -42,6 +42,7 @@ azure_cluster_operation = environment_variables_dict.get('azure_cluster_operatio
 ci_status = environment_variables_dict.get('ci_status', '')
 install_ocp_version = environment_variables_dict.get('install_ocp_version', '')
 upgrade_ocp_version = environment_variables_dict.get('upgrade_ocp_version', '')
+kubeadmin_password = environment_variables_dict.get('kubeadmin_password', '')
 odf_version = environment_variables_dict.get('odf_version', '')
 lso_version = environment_variables_dict.get('lso_version', '')
 cnv_version = environment_variables_dict.get('cnv_version', '')
@@ -163,9 +164,8 @@ def upgrade_ocp_bare_metal(step: str):
     This method runs Bare Metal OCP upgrade
     :return:
     """
-    bare_metal_operations = BareMetalOperations(user=provision_user)
-    bare_metal_operations.connect_to_provisioner()
-    oc = bare_metal_operations.oc_login()
+    bare_metal_operations = BareMetalOperations()
+    oc = bare_metal_operations.oc_login(kubeadmin_password=kubeadmin_password)
     if step == 'run_bare_metal_ocp_upgrade':
         if not bare_metal_operations.is_ocp_already_upgraded(oc):
             bare_metal_operations.run_ocp_upgrade(oc)
@@ -180,7 +180,7 @@ def upgrade_ocp_bare_metal(step: str):
             error_message = f'OCP {upgrade_ocp_version} upgrade failed'
             logger.error(error_message)
             raise RuntimeError(error_message)
-    bare_metal_operations.disconnect_from_provisioner()
+
 
 
 @logger_time_stamp

benchmark_runner/workloads/bootstorm_vm.py

@@ -217,6 +217,7 @@ class BootstormVM(WorkloadsOperations):
             failure_vms = []  # List to store failed VM names
 
             if self._wait_for_upgrade_version:
+                logger.info(f"wait for ocp upgrade version: {self._wait_for_upgrade_version}")
                 upgrade_done = self._oc.get_cluster_status() == f'Cluster version is {self._wait_for_upgrade_version}'
                 current_wait_time = 0
 

benchmark_runner/workloads/workloads_operations.py

@@ -391,6 +391,7 @@ class WorkloadsOperations:
         :return:
         """
         date_format = '%Y_%m_%d'
+        self._oc.login()
         metadata = {'ocp_version': self._oc.get_ocp_server_version(),
                     'previous_ocp_version': self._oc.get_previous_ocp_version() if self._upgrade_ocp_version else '',
                     'cnv_version': self._oc.get_cnv_version(),

{benchmark_runner-1.0.740.dist-info → benchmark_runner-1.0.742.dist-info}/METADATA

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

{benchmark_runner-1.0.740.dist-info → benchmark_runner-1.0.742.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=a9nZZrPxh01N6fY2aadrHW3_p8L4p5av3SnX9uCYCmU,17721
+benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=rSRd16sWTeYWto8dRu0rDutIPHk0T5qvi2WmpJC5IAk,18045
 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,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=-ta6Z9H4D0GMX2mNt83M_j6Lr3u_7CgeBB2I_PyQcDs,67742
+benchmark_runner/common/oc/oc.py,sha256=8dVYHOhg8dLN-zBxgFSLA5N-V86HIW3YT_Je1eNajwg,67895
 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
@@ -162,18 +162,18 @@ benchmark_runner/krkn_hub/krknhub_workloads.py,sha256=qNRZA-FBQZiT6h013WbP6zBRIN
 benchmark_runner/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/main/environment_variables.py,sha256=3bzRBuvSkcqcvleIKrCTEWGwd788mg20_2n8T1_kWwA,28075
 benchmark_runner/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZdJRlRq8ZUTt0h8jFvUtrnP4m4AIY,437
-benchmark_runner/main/main.py,sha256=SB-rD4U_978gP8ojGUtIsYzhSsmzeEDsUfOiJQJdz9c,14097
+benchmark_runner/main/main.py,sha256=MWZnLXCAvx9lC2l9s6q3fzI5iiSnYA2ybyNhDhud3aA,14087
 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=1dOThOr4QUptjHg-fV4_-T-0TpriyBvO6As94mLKMtU,18511
+benchmark_runner/workloads/bootstorm_vm.py,sha256=gQcAhsu-5aWp55JqzgLUskCZGZrX53KXoE_Cz2O-6HA,18606
 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.740.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.740.dist-info/METADATA,sha256=y_Yy8xdbItGuAITl1xQJe4blHuymN2ugMbGRou2teuI,11498
-benchmark_runner-1.0.740.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-benchmark_runner-1.0.740.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.740.dist-info/RECORD,,
+benchmark_runner/workloads/workloads_operations.py,sha256=SdddQUbAN5biRjZr5CvmlgKxcE4xatCnoSBm9cn1K9A,25286
+benchmark_runner-1.0.742.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.742.dist-info/METADATA,sha256=z6f5NpcnK9f4Ne1NUbKG8yJFV0ZYFrM7bTzJc8_ZICI,11498
+benchmark_runner-1.0.742.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+benchmark_runner-1.0.742.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.742.dist-info/RECORD,,