benchmark-runner 1.0.855__tar.gz → 1.0.857__tar.gz

{benchmark_runner-1.0.855/benchmark_runner.egg-info → benchmark_runner-1.0.857}/PKG-INFO

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

{benchmark_runner-1.0.855 → benchmark_runner-1.0.857}/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-1.0.855 → benchmark_runner-1.0.857}/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-1.0.855 → benchmark_runner-1.0.857}/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.855 → benchmark_runner-1.0.857/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.855 → benchmark_runner-1.0.857}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.855'  # update also .bumpversion.cfg
+__version__ = '1.0.857'  # update also .bumpversion.cfg
 
 
 here = path.abspath(path.dirname(__file__))