benchmark-runner 1.0.858__py3-none-any.whl → 1.0.859__py3-none-any.whl

benchmark_runner/common/ocp_resources/create_nhc_far.py

@@ -1,4 +1,3 @@
-
 import os
 
 from benchmark_runner.common.oc.oc import OC
@@ -10,6 +9,7 @@ class CreateNHCFAR(CreateOCPResourceOperations):
     """
     This class is created node-health-check and fence-agents-remediation operators
     """
+
     def __init__(self, oc: OC, path: str, resource_list: list):
         super().__init__(oc)
         self.__oc = oc
@@ -28,15 +28,24 @@ class CreateNHCFAR(CreateOCPResourceOperations):
 
             if '03_nhc_subscription.yaml' in resource:
                 self.wait_for_ocp_resource_create(operator='nhc',
-                                                  verify_cmd="oc get csv -n openshift-workload-availability -o jsonpath='{.items[0].status.phase}'",
+                                                  verify_cmd=f"oc get csv -n openshift-workload-availability -o json | jq -r '.items[] | select(.metadata.name | startswith(\"node-healthcheck-operator\")) | .status.phase'",
                                                   status='Succeeded')
             if '04_far_subscription.yaml' in resource:
                 self.wait_for_ocp_resource_create(operator='far',
-                                                  verify_cmd="oc get csv -n openshift-workload-availability -o jsonpath='{.items[1].status.phase}'",
+                                                  verify_cmd=f"oc get csv -n openshift-workload-availability -o json | jq -r '.items[] | select(.metadata.name | startswith(\"fence-agents-remediation\")) | .status.phase'",
                                                   status='Succeeded')
             if '05_nhc_far.yaml' in resource:
-                # Verify NHC is enabled
-                self.wait_for_ocp_resource_create(operator='nhc_far',
-                                                  verify_cmd="oc get nhc -A -o jsonpath='{range .items[*]}{.status.phase}{\"\\n\"}{end}'",
-                                                  status='Enabled')
+                # Wait for NHC to be enabled using a retries mechanism
+                for _ in range(self.__oc.RETRIES):
+                    try:
+                        self.wait_for_ocp_resource_create(
+                            operator='nhc_far',
+                            verify_cmd="oc get nhc -A -o jsonpath='{range .items[*]}{.status.phase}{\"\\n\"}{end}'",
+                            status='Enabled',
+                            timeout=600
+                        )
+                        break
+                    except:
+                        # rerun latest resource creation, if nhc is not enabled
+                        self.__oc.create_async(yaml=os.path.join(self.__path, resource))
         return True

{benchmark_runner-1.0.858.dist-info → benchmark_runner-1.0.859.dist-info}/METADATA

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

{benchmark_runner-1.0.858.dist-info → benchmark_runner-1.0.859.dist-info}/RECORD

@@ -55,7 +55,7 @@ benchmark_runner/common/ocp_resources/create_cnv.py,sha256=AXsyR8_g_RIFHz2rkyHzz
 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
-benchmark_runner/common/ocp_resources/create_nhc_far.py,sha256=y_iOoSTgIzQIVBK7a8u7UJNpBMVaR3t741AjQd0L1kI,2001
+benchmark_runner/common/ocp_resources/create_nhc_far.py,sha256=WGNDMLZfODy6FImmkgQjxg3Z4Gsnpxwa5lJCOShmxe8,2541
 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=47SyVjtv5e9vKuRQFlC-VfGKXBLEl46rut4XVeZRsMo,6834
@@ -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.858.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.858.dist-info/METADATA,sha256=074tDdz5WycIbCk8cDCqBlTEmoeZX2_1QXfp0HPr1bQ,11582
-benchmark_runner-1.0.858.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.858.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.858.dist-info/RECORD,,
+benchmark_runner-1.0.859.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.859.dist-info/METADATA,sha256=9IMbZh6H4nYRpz8DtigZ6zAvqnooy7ZWgcAlAUaUbTI,11582
+benchmark_runner-1.0.859.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.859.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.859.dist-info/RECORD,,