benchmark-runner 1.0.760__py3-none-any.whl → 1.0.762__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of benchmark-runner might be problematic. Click here for more details.
- benchmark_runner/common/oc/oc.py +20 -9
- {benchmark_runner-1.0.760.dist-info → benchmark_runner-1.0.762.dist-info}/METADATA +1 -1
- {benchmark_runner-1.0.760.dist-info → benchmark_runner-1.0.762.dist-info}/RECORD +6 -6
- {benchmark_runner-1.0.760.dist-info → benchmark_runner-1.0.762.dist-info}/WHEEL +1 -1
- {benchmark_runner-1.0.760.dist-info → benchmark_runner-1.0.762.dist-info}/LICENSE +0 -0
- {benchmark_runner-1.0.760.dist-info → benchmark_runner-1.0.762.dist-info}/top_level.txt +0 -0
benchmark_runner/common/oc/oc.py
CHANGED
|
@@ -699,19 +699,30 @@ class OC(SSH):
|
|
|
699
699
|
f"{self._cli} -n {environment_variables.environment_variables_dict['namespace']} get benchmark/{workload} -o jsonpath={{.status.uuid}}")
|
|
700
700
|
return long_uuid
|
|
701
701
|
|
|
702
|
-
def
|
|
702
|
+
def _get_ocp_version_part(self, index):
|
|
703
703
|
"""
|
|
704
|
-
This method
|
|
705
|
-
@
|
|
704
|
+
This method retrieves a specific part (major/minor) of the OCP version with retries.
|
|
705
|
+
@param index: int - 0 for major version, 1 for minor version.
|
|
706
|
+
@return: int
|
|
706
707
|
"""
|
|
707
|
-
|
|
708
|
+
for attempt in range(self.RETRIES):
|
|
709
|
+
try:
|
|
710
|
+
version_str = self.get_ocp_server_version().split('.')[index]
|
|
711
|
+
return int(version_str)
|
|
712
|
+
except (ValueError, IndexError):
|
|
713
|
+
if attempt < self.RETRIES - 1:
|
|
714
|
+
logger.info('Retries to get OCP version')
|
|
715
|
+
time.sleep(self.DELAY) # Wait before retrying
|
|
716
|
+
else:
|
|
717
|
+
raise RuntimeError(f"Failed to retrieve OCP version part {index} after {self.RETRIES} attempts.")
|
|
718
|
+
|
|
719
|
+
def get_ocp_major_version(self):
|
|
720
|
+
"""Returns the OCP major version."""
|
|
721
|
+
return self._get_ocp_version_part(0)
|
|
708
722
|
|
|
709
723
|
def get_ocp_minor_version(self):
|
|
710
|
-
"""
|
|
711
|
-
|
|
712
|
-
@return:
|
|
713
|
-
"""
|
|
714
|
-
return int(self.get_ocp_server_version().split('.')[1])
|
|
724
|
+
"""Returns the OCP minor version."""
|
|
725
|
+
return self._get_ocp_version_part(1)
|
|
715
726
|
|
|
716
727
|
def get_prom_token(self):
|
|
717
728
|
"""
|
|
@@ -46,7 +46,7 @@ benchmark_runner/common/logger/init_logger.py,sha256=ERa-gNqrl2pZybj7v3csvmao7Mv
|
|
|
46
46
|
benchmark_runner/common/logger/logger_exceptions.py,sha256=rivdlRm_jIsKQ53rP_-HX8emdtOmQNO4JuIkg8fnBoc,454
|
|
47
47
|
benchmark_runner/common/logger/logger_time_stamp.py,sha256=2JgugN9LpXF4Ijx0wPRzz3DAGJB8eJpM5g1qPvbWbV8,1479
|
|
48
48
|
benchmark_runner/common/oc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
49
|
-
benchmark_runner/common/oc/oc.py,sha256=
|
|
49
|
+
benchmark_runner/common/oc/oc.py,sha256=jtKqmUDCaqRA90utzKDVENXQASSdBNYV03CiBOwHuuE,68864
|
|
50
50
|
benchmark_runner/common/oc/oc_exceptions.py,sha256=XfKUzeK3Ors_Y2csQEoGqrlsZlYvq6OXLkFh9s_mQRM,6311
|
|
51
51
|
benchmark_runner/common/oc/singleton_oc_login.py,sha256=OISe7GxN-povQBk1GYVwkdcuEvIbDQP5QImYbNvhX5Y,2395
|
|
52
52
|
benchmark_runner/common/ocp_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -173,8 +173,8 @@ benchmark_runner/workloads/windows_vm.py,sha256=eHK79ueAkSlNC1uamz19o7CO20wzJi-U
|
|
|
173
173
|
benchmark_runner/workloads/workloads.py,sha256=F9fnk4h715tq7ANSCbDH0jktB8fpr_u3YG61Kdi5_os,1422
|
|
174
174
|
benchmark_runner/workloads/workloads_exceptions.py,sha256=u7VII95iPRF_YhfpGH1U1RmgiIYESMOtbSF1dz7_ToE,1858
|
|
175
175
|
benchmark_runner/workloads/workloads_operations.py,sha256=EEIZjNYGjEkyUafxFKSu4X9jaN_wgYDbMeCi1hZBZ-0,25186
|
|
176
|
-
benchmark_runner-1.0.
|
|
177
|
-
benchmark_runner-1.0.
|
|
178
|
-
benchmark_runner-1.0.
|
|
179
|
-
benchmark_runner-1.0.
|
|
180
|
-
benchmark_runner-1.0.
|
|
176
|
+
benchmark_runner-1.0.762.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
|
177
|
+
benchmark_runner-1.0.762.dist-info/METADATA,sha256=g_GxckOt9Ja9ZJ6mzUtqXTUWl6RdkuvQpTPXNKwnguA,11498
|
|
178
|
+
benchmark_runner-1.0.762.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
|
|
179
|
+
benchmark_runner-1.0.762.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
|
|
180
|
+
benchmark_runner-1.0.762.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|