benchmark-runner 1.0.859__tar.gz → 1.0.861__tar.gz

{benchmark_runner-1.0.859/benchmark_runner.egg-info → benchmark_runner-1.0.861}/PKG-INFO

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

{benchmark_runner-1.0.859 → benchmark_runner-1.0.861}/benchmark_runner/common/oc/oc.py

@@ -161,14 +161,11 @@ class OC(SSH):
         @param operator_name: str - The name of the operator to search for.
         @return: major version
         """
-        cmd = (
-            f"""{self._cli} get csv -n {namespace} -o json | """
-            f"""jq -r '.items[] | select(.metadata.name | startswith("{operator_name}")) | .spec.version'"""
-        )
+        cmd = f"""{self._cli} get csv -n {namespace} -o json | 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_name: str, version: str, namespace: str, timeout: int =  SHORT_TIMEOUT):
+    def wait_for_operator_installation(self, operator_name: str, version: str, namespace: str, timeout: int = int(environment_variables.environment_variables_dict['timeout'])):
         """
         This method waits till operator version is installed successfully
         @param operator_name:

{benchmark_runner-1.0.859 → benchmark_runner-1.0.861}/benchmark_runner/common/ocp_resources/create_cnv.py

@@ -42,18 +42,18 @@ class CreateCNV(CreateOCPResourceOperations):
                     if cnv_nightly_channel:
                         # wait till get the patch
                         self.wait_for_ocp_resource_create(operator=resource,
-                                                          verify_cmd="oc get InstallPlan -n openshift-cnv -o jsonpath={.items[0].metadata.name}",
+                                                          verify_cmd = """oc get installplan -n openshift-cnv -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | startswith("kubevirt-hyperconverged-operator")) | select(.status.phase=="Complete") | .metadata.name' | tail -n1""",
                                                           status="install-")
                         self.apply_patch(namespace='openshift-cnv', operator='cnv')
                     # stable channel
                     else:
                         self.wait_for_ocp_resource_create(operator='cnv',
-                                                          verify_cmd="oc get csv -n openshift-cnv -o jsonpath='{.items[0].status.phase}'",
+                                                          verify_cmd="""oc get csv -n openshift-cnv -o json | jq -r '.items[] | select(.metadata.name | startswith("kubevirt-hyperconverged-operator")) | .status.phase'""",
                                                           status='Succeeded')
                 # for second script wait for refresh status
                 if '02_hyperconverge.yaml' in resource:
                     # Wait that till succeeded
                     self.wait_for_ocp_resource_create(operator='cnv',
-                                                      verify_cmd="oc get csv -n openshift-cnv -o jsonpath='{.items[0].status.phase}'",
+                                                      verify_cmd = """oc get csv -n openshift-cnv -o json | jq -r '.items[] | select(.metadata.name | startswith("kubevirt-hyperconverged-operator")) | .status.phase'""",
                                                       status='Succeeded')
         return True

{benchmark_runner-1.0.859 → benchmark_runner-1.0.861/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.859 → benchmark_runner-1.0.861}/setup.py

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