benchmark-runner 1.0.860__py3-none-any.whl → 1.0.861__py3-none-any.whl

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/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.860.dist-info → benchmark_runner-1.0.861.dist-info}/METADATA

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

{benchmark_runner-1.0.860.dist-info → benchmark_runner-1.0.861.dist-info}/RECORD

@@ -47,11 +47,11 @@ 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=EctUDa4KrmqjURaxCVcc0i8EQ1CnYTv0mpIo4yTEBoA,74750
+benchmark_runner/common/oc/oc.py,sha256=sYWn4PSYz5HbZBr-rIXvb0A_yMbqE-Xg7RDeGkCeepk,74756
 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
-benchmark_runner/common/ocp_resources/create_cnv.py,sha256=AXsyR8_g_RIFHz2rkyHzzvvUDIiGdOi9rZWJPhiPzDQ,3511
+benchmark_runner/common/ocp_resources/create_cnv.py,sha256=UksjOnqhMaUp7E8FIPgvx15PgCLoQ9QnjDJ2aQltG5E,3830
 benchmark_runner/common/ocp_resources/create_custom.py,sha256=rthm96yDzI-Hke54hLWTs0O3gDtpQPR6n184ehaEevo,1029
 benchmark_runner/common/ocp_resources/create_kata.py,sha256=IhfnDHj0lLUVENA-Nh9BucSAt0BqL8mtqT6QloMzIDg,3721
 benchmark_runner/common/ocp_resources/create_lso.py,sha256=uzhYTUK-645_2L45Q2sbDOuvSLeGnN-UdbdrkYR5PqQ,1634
@@ -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.860.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.860.dist-info/METADATA,sha256=3YtA_LInsZ_LR-C41QGBgYOJEMMMXVlmudSvdwHRQiQ,11582
-benchmark_runner-1.0.860.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.860.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.860.dist-info/RECORD,,
+benchmark_runner-1.0.861.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.861.dist-info/METADATA,sha256=xF3c5OvidwUXQy1OgFgi9E-LO6-DL2E3s45t7N1tZeY,11582
+benchmark_runner-1.0.861.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.861.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.861.dist-info/RECORD,,