benchmark-runner 1.0.858__tar.gz → 1.0.860__tar.gz

{benchmark_runner-1.0.858/benchmark_runner.egg-info → benchmark_runner-1.0.860}/PKG-INFO

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

{benchmark_runner-1.0.858 → benchmark_runner-1.0.860}/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 → benchmark_runner-1.0.860/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.858 → benchmark_runner-1.0.860}/setup.py

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