benchmark-runner 1.0.829__py3-none-any.whl → 1.0.831__py3-none-any.whl

benchmark_runner/common/oc/oc.py

@@ -89,8 +89,9 @@ class OC(SSH):
         @param upgrade_channel: upgrade channel candidate or stable, default stable
         @return:
         """
+        # default stable
+        upgrade_channel = upgrade_channel or 'stable'
         ocp_channel = '.'.join(upgrade_ocp_version.split('.')[:2])
-
         # see: https://access.redhat.com/articles/7031404
         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"
@@ -101,38 +102,37 @@ class OC(SSH):
 
     def upgrade_in_progress(self):
         """
-        This method returns True if an upgrade is in progress and False otherwise, with retries on transient failures.
-        @return: bool
+        Checks whether an OpenShift upgrade is in progress by inspecting the 'Progressing' status condition.
+        Retries on transient failures.
+
+        @return: bool - True if upgrade is in progress, False otherwise.
         """
         for i in range(1, self.RETRIES + 1):
             try:
-                status = self.run(
-                    f"{self._cli} get clusterversion version "
-                    "-o jsonpath='{{.status.conditions[?(@.type==\"Progressing\")].status}}'"
-                ).strip()
+                status = self.run(f"{self._cli} get clusterversion version -o jsonpath='{{.status.conditions[?(@.type==\"Progressing\")].status}}'").strip()
                 return status == 'True'
             except Exception as e:
                 logger.warning(f"[upgrade_in_progress] attempt {i}/{self.RETRIES} failed: {e}")
                 time.sleep(self.DELAY)
-        # Final attempt (will bubble if it fails)
-        return self.run(
-            f"{self._cli} get clusterversion version "
-            "-o jsonpath='{{.status.conditions[?(@.type==\"Progressing\")].status}}'"
-        ).strip() == 'True'
+
+        return False
 
     @logger_time_stamp
     def wait_for_ocp_upgrade_start(self, upgrade_version: str, timeout: int = SHORT_TIMEOUT):
         """
-        This method waits for ocp upgrade to start
-        :param upgrade_version:
-        :param timeout:
-        :return:
+        This method waits for the OCP upgrade to start.
+        :param upgrade_version: The target OCP version.
+        :param timeout: Timeout in seconds (waits indefinitely if <= 0).
+        :return: True if upgrade starts within timeout, else raises UpgradeNotStartTimeout.
         """
         current_wait_time = 0
-        while timeout <= 0 or current_wait_time <= timeout and not self.upgrade_in_progress():
-            # sleep for x seconds
+        while timeout <= 0 or current_wait_time <= timeout:
+            if self.upgrade_in_progress():
+                return True
             time.sleep(OC.SLEEP_TIME)
             current_wait_time += OC.SLEEP_TIME
+
+        # Final check after timeout
         if self.upgrade_in_progress():
             return True
         else:

{benchmark_runner-1.0.829.dist-info → benchmark_runner-1.0.831.dist-info}/METADATA

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

{benchmark_runner-1.0.829.dist-info → benchmark_runner-1.0.831.dist-info}/RECORD

@@ -47,7 +47,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=uY4kH2ootoaDUf8JSvWzQI2uAvpgVXNYSBSrHLwkX1E,73524
+benchmark_runner/common/oc/oc.py,sha256=m6O8H-crGSCNaBNnHbVs4svYA9oi-OJ3TuC4BdTYM6g,73592
 benchmark_runner/common/oc/oc_exceptions.py,sha256=XfKUzeK3Ors_Y2csQEoGqrlsZlYvq6OXLkFh9s_mQRM,6311
 benchmark_runner/common/oc/singleton_oc_login.py,sha256=OISe7GxN-povQBk1GYVwkdcuEvIbDQP5QImYbNvhX5Y,2395
 benchmark_runner/common/ocp_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -174,8 +174,8 @@ benchmark_runner/workloads/windows_vm.py,sha256=qFVD3qBFMnVpYXnrpam-7H5-0Yzvx6qt
 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=8utD-uU_MNZn5JOC2r5OVq5BfCPkxlUvP3xlUP9oIGk,27160
-benchmark_runner-1.0.829.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.829.dist-info/METADATA,sha256=hh9R_sn79bTAF1XymlclWHhyyJyc83kPwPVzoy_ASI8,11520
-benchmark_runner-1.0.829.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.829.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.829.dist-info/RECORD,,
+benchmark_runner-1.0.831.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.831.dist-info/METADATA,sha256=QMxm8DwXIVLqaZHIKcIdyD0ftG672hFL2rOJ5VmFfG4,11520
+benchmark_runner-1.0.831.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.831.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.831.dist-info/RECORD,,