benchmark-runner 1.0.856__py3-none-any.whl → 1.0.857__py3-none-any.whl

benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py

@@ -302,16 +302,16 @@ class BareMetalOperations:
         if oc.get_upgrade_version() != self._upgrade_ocp_version:
             return False
 
-        # Operator details mapping
+        # Operator details mapping: short_key -> (version, namespace, operator_name_prefix)
         operators_to_check = {
-            "cnv": (cnv_version, "openshift-cnv"),
-            "odf": (odf_version, "openshift-storage"),
-            "lso": (lso_version, "openshift-local-storage"),
+            "cnv": (cnv_version, "openshift-cnv", "kubevirt-hyperconverged-operator"),
+            "odf": (odf_version, "openshift-storage", "odf-operator"),
+            "lso": (lso_version, "openshift-local-storage", "local-storage-operator"),
         }
 
         upgrade_checks = [
-            oc.wait_for_operator_installation(operator=op, version=ver, namespace=ns)
-            for op, (ver, ns) in operators_to_check.items()
+            oc.wait_for_operator_installation(operator_name=operator_name, version=ver, namespace=ns)
+            for _, (ver, ns, operator_name) in operators_to_check.items()
             if ver  # only include if a version was specified
         ]
 

benchmark_runner/common/oc/oc.py

@@ -154,34 +154,39 @@ class OC(SSH):
         """
         return self.run(f"{self._cli} get clusterversion version -o jsonpath='{{.status.conditions[?(@.type==\"Progressing\")].message}}'")
 
-    def get_operator_version(self, namespace):
+    def get_operator_version(self, namespace: str, operator_name: str = None):
         """
         This method returns the operator version from the specified namespace.
         @param namespace: str - The namespace to search for the operator version.
+        @param operator_name: str - The name of the operator to search for.
         @return: major version
         """
-        version = self.run(f"{self._cli} get csv -n {namespace} -o jsonpath='{{.items[0].spec.version}}'")
+        cmd = (
+            f"""{self._cli} get csv -n {namespace} -o json | """
+            f"""jq -r '.items[] | select(.metadata.name | startswith("{operator_name}")) | .spec.version'"""
+        )
+        version = self.run(cmd)
         return '.'.join(version.split('.')[:2])
 
-    def wait_for_operator_installation(self, operator: str, version: str, namespace: str, timeout: int =  SHORT_TIMEOUT):
+    def wait_for_operator_installation(self, operator_name: str, version: str, namespace: str, timeout: int =  SHORT_TIMEOUT):
         """
         This method waits till operator version is installed successfully
-        @param operator:
+        @param operator_name:
         @param version:
         @param timeout:
         @param namespace:
         @return:
         """
         current_wait_time = 0
-        while timeout <= 0 or current_wait_time <= timeout and not self.get_operator_version(namespace) == version:
+        while timeout <= 0 or current_wait_time <= timeout and not self.get_operator_version(namespace, operator_name) == version:
             # sleep for x seconds
             time.sleep(OC.SLEEP_TIME)
             current_wait_time += OC.SLEEP_TIME
-        if self.get_operator_version(namespace) == version:
-            logger.info(f'{operator} operator version: {version} in namespace: {namespace} has been installed successfully')
+        if self.get_operator_version(namespace, operator_name) == version:
+            logger.info(f'{operator_name} operator version: {version} in namespace: {namespace} has been installed successfully')
             return True
         else:
-            raise OperatorInstallationTimeout(operator=operator, version=version, namespace=namespace)
+            raise OperatorInstallationTimeout(operator=operator_name, version=version, namespace=namespace)
 
     def healthcheck(self, action: str):
         """

benchmark_runner/common/ocp_resources/create_ocp_resource_operations.py

@@ -14,7 +14,7 @@ class CreateOCPResourceOperations:
     """
     # Expected CSVs List names
     EXPECTED_ODF_CSV = ['mcg-operator', 'ocs-operator', 'odf-csi-addons-operator', 'odf-operator']
-    SLEEP_TIME = 60
+    SLEEP_TIME = 30
 
     def __init__(self, oc: OC):
         self._environment_variables_dict = environment_variables.environment_variables_dict

{benchmark_runner-1.0.856.dist-info → benchmark_runner-1.0.857.dist-info}/METADATA

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

{benchmark_runner-1.0.856.dist-info → benchmark_runner-1.0.857.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=Ok3l0rxCAqZd2_yzuOuUO6Zs3KjvYC85p2VQf7uyMnM,4735
 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=FSQ5WWEc1MnvSou643R_kNFwVA6pjOtKaEUNBXLT6q8,19462
+benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=17lTO7myBiqOcvDx8fxypDNosmnQVoeX95B7vAkcXH8,19627
 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
@@ -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=bfOgUBFi5h0KkYeSPfTKFrUFums7-rCOFsH-mHtGY8o,74467
+benchmark_runner/common/oc/oc.py,sha256=EctUDa4KrmqjURaxCVcc0i8EQ1CnYTv0mpIo4yTEBoA,74750
 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
@@ -58,7 +58,7 @@ benchmark_runner/common/ocp_resources/create_lso.py,sha256=uzhYTUK-645_2L45Q2sbD
 benchmark_runner/common/ocp_resources/create_nhc_far.py,sha256=y_iOoSTgIzQIVBK7a8u7UJNpBMVaR3t741AjQd0L1kI,2001
 benchmark_runner/common/ocp_resources/create_ocp_resource.py,sha256=0iMbpOuG4Y19J9YjMO8AdlwJke1UgKMSX4eA-AnIUck,5478
 benchmark_runner/common/ocp_resources/create_ocp_resource_exceptions.py,sha256=hthowyHAeg66IZHYPe1FWU3dnhwXcQtPBrOQSO1RZMU,941
-benchmark_runner/common/ocp_resources/create_ocp_resource_operations.py,sha256=FnXQfw0kbwS2RsnmuNMU1I2atJCQUbuxTAsZRDt9VXA,6834
+benchmark_runner/common/ocp_resources/create_ocp_resource_operations.py,sha256=47SyVjtv5e9vKuRQFlC-VfGKXBLEl46rut4XVeZRsMo,6834
 benchmark_runner/common/ocp_resources/create_odf.py,sha256=Frtx4EOYILHROeSzX3sO9b28zzDUt4waN92RwSPzr4c,4421
 benchmark_runner/common/ocp_resources/migrate_infra.py,sha256=R9iPk8oXv8_w6uz0q-nebe25C1KbQXN-l-d6_AWK4gA,1295
 benchmark_runner/common/ocp_resources/cnv/template/01_operator_template.yaml,sha256=Ba7RYN1hPknLXBKHsgdXwGSnQETTUWHqgxEDYnx8GSU,764
@@ -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=Z7cT5rrLmz_SEIbtxbxyniaA0dQ07s8nK1I2EWcoBqM,27378
-benchmark_runner-1.0.856.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.856.dist-info/METADATA,sha256=Cl7JPiCtr6tfkC8FJat7lDKiVp0AAcOG42TsPJQ3ZJs,11582
-benchmark_runner-1.0.856.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.856.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.856.dist-info/RECORD,,
+benchmark_runner-1.0.857.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.857.dist-info/METADATA,sha256=rYnxFFz_XXcStmOtPpxc3w0ncGtXa76W7Hnyk2i-BwU,11582
+benchmark_runner-1.0.857.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.857.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.857.dist-info/RECORD,,