Hot Fix: Filter healthcheck (#931)

* OpenShift installer retry mechanism2

* This reverts commit aae3470.

* Filter out node-healthcheck-operator and self-node-remediation during CSV verification

benchmark_runner/common/oc/oc.py

@@ -914,8 +914,9 @@ def wait_for_upgrade_version(self, operator: str, upgrade_version: str,
         current_wait_time = 0
 
         while timeout <= 0 or current_wait_time <= timeout:
-            upgrade_versions = self.run(
-                f"{self.__cli} get csv -n {namespace} -o custom-columns=:.spec.version --no-headers").splitlines()
+            #  Filter out node-healthcheck-operator and self-node-remediation during CSV verification because they exist in all namespaces
+            upgrade_versions = self.run(f"{self.__cli} get csv -n {namespace} -o json | jq -r '.items[] | select(.metadata.name | test(\"node-healthcheck-operator|self-node-remediation\") | not) | .spec.version'".splitlines()
+).splitlines()
             count_upgrade_version = sum(1 for actual_upgrade_version in upgrade_versions if
                                         '.'.join(actual_upgrade_version.split('.')[0:2]) == upgrade_version)