benchmark-runner 1.0.739__py3-none-any.whl → 1.0.741__py3-none-any.whl

benchmark_runner/common/google_drive/google_drive_operations.py

@@ -1,6 +1,8 @@
 
 import os
+import time
 
+from googleapiclient.errors import HttpError
 from googleapiclient.discovery import build
 from google.oauth2.credentials import Credentials
 from googleapiclient.http import MediaFileUpload
@@ -137,34 +139,40 @@ class GoogleDriveOperations:
             logger.error(f"Error creating folder '{folder_name}': {e}")
             return None
 
-    def _find_folder_id(self, parent_folder_id, folder_name):
+    def _find_folder_id(self, parent_folder_id, folder_name, max_retries=3, delay=5):
         """
-        Helper method to find the folder ID by name within a specified parent folder.
+        Finds a folder ID by name within a specified parent folder, with retry handling.
+
         :param parent_folder_id: The ID of the parent folder to search within.
         :param folder_name: The name of the folder to find.
+        :param max_retries: The maximum number of retry attempts.
+        :param delay: The delay (in seconds) between retries.
         :return: The ID of the folder if found, otherwise None.
         """
-        page_token = None
-        while True:
-            results = self.service.files().list(
-                q=f"'{parent_folder_id}' in parents and trashed = false and mimeType = 'application/vnd.google-apps.folder'",
-                includeItemsFromAllDrives=True,
-                supportsAllDrives=True,
-                pageSize=100,
-                fields="nextPageToken, files(id, name)",
-                pageToken=page_token
-            ).execute()
-
-            items = results.get('files', [])
-            for item in items:
-                if item['name'] == folder_name:
-                    return item['id']
-
-            page_token = results.get('nextPageToken', None)
-            if page_token is None:
-                break
-
-        return None
+        for attempt in range(max_retries):
+            try:
+                response = self.service.files().list(
+                    q=f"'{parent_folder_id}' in parents and name='{folder_name}' and mimeType='application/vnd.google-apps.folder' and trashed=false",
+                    supportsAllDrives=True,
+                    includeItemsFromAllDrives=True,
+                    pageSize=100,
+                    fields="files(id, name)"
+                ).execute()
+                folders = response.get('files', [])
+                if folders:
+                    return folders[0]['id']
+            except HttpError as e:
+                if e.resp.status in [403, 404]:  # Permanent errors (e.g., permission denied)
+                    logger.error(f"Permission error or folder not found: {e}")
+                    break  # No point in retrying
+                if attempt < max_retries - 1:
+                    logger.warning(f"Attempt {attempt + 1} failed with error {e}. Retrying in {delay} seconds...")
+                    time.sleep(delay)
+                else:
+                    logger.error(f"Failed after {max_retries} attempts: {e}")
+                    raise
+
+        return None  # Explicit return if folder is not found
 
     def get_folder_id_by_path(self, folder_path, parent_folder_id):
         """

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/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.739.dist-info → benchmark_runner-1.0.741.dist-info}/METADATA

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

{benchmark_runner-1.0.739.dist-info → benchmark_runner-1.0.741.dist-info}/RECORD

@@ -37,7 +37,7 @@ benchmark_runner/common/elasticsearch/elasticsearch_operations.py,sha256=fXckd9u
 benchmark_runner/common/github/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/github/github_operations.py,sha256=wp4zH0_4Qzb_c-GtQlP3VnN374H0aa_icGPk0pwkAZc,1111
 benchmark_runner/common/google_drive/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-benchmark_runner/common/google_drive/google_drive_operations.py,sha256=PuL7pWKJRTTIwnRPM6XRBNyHe4Hg6g3ee9cYZnKrdJc,15513
+benchmark_runner/common/google_drive/google_drive_operations.py,sha256=V-N9Wgz25lp-7loH9Nxv97dqMYc0NY82x2E8hOpcwcw,16205
 benchmark_runner/common/grafana/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/grafana/grafana_operations.py,sha256=Emt-p44OSe_XgVp6c94EVcDEaniyYtUDQMWCGIP0GR8,4877
 benchmark_runner/common/grafana/update_grafana_latest_value_mappings.py,sha256=aBKXx1spB8O2kjVsOl5heLl5lKcU07Hx8oHJLasJpSQ,5523
@@ -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
@@ -165,15 +165,15 @@ benchmark_runner/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZ
 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=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.739.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.739.dist-info/METADATA,sha256=PS3AR0_YwzwzhX4uiJV014Xn8eaggLprhFyHgDNSNU0,11498
-benchmark_runner-1.0.739.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-benchmark_runner-1.0.739.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.739.dist-info/RECORD,,
+benchmark_runner/workloads/workloads_operations.py,sha256=SdddQUbAN5biRjZr5CvmlgKxcE4xatCnoSBm9cn1K9A,25286
+benchmark_runner-1.0.741.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.741.dist-info/METADATA,sha256=CYjJUj8bTiL6JYOjMDsy4FQeULdR3_JDyBeJvunwZJQ,11498
+benchmark_runner-1.0.741.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+benchmark_runner-1.0.741.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.741.dist-info/RECORD,,