Merge pull request #585 from validatedpatterns/main

sync: main to rhdp-deploy

Author: mbaldessari

.github/workflows/ansible-lint.yml

@@ -15,4 +15,4 @@ jobs:
           persist-credentials: false
 
       - name: Lint Ansible Playbook
-        uses: ansible/ansible-lint@8ba9595a4acd1b906eb75568b34f6ef592cd1528
+        uses: ansible/ansible-lint@5fac056c45595896c973fbde871f01f6cb14d74c

.github/workflows/superlinter.yml

@@ -25,7 +25,7 @@ jobs:
       # Run Linter against code base #
       ################################
       - name: Lint Code Base
-        uses: super-linter/super-linter/slim@61abc07d755095a68f4987d1c2c3d1d64408f1f9 # v8.5.0
+        uses: super-linter/super-linter/slim@9e863354e3ff62e0727d37183162c4a88873df41 # v8.6.0
         env:
           VALIDATE_ALL_CODEBASE: true
           DEFAULT_BRANCH: main

tests/interop/test_validate_edge_site_components.py

@@ -44,7 +44,6 @@ def test_validate_argocd_reachable_edge_site(openshift_dyn_client):
 def test_check_pod_status(openshift_dyn_client):
     logger.info("Checking pod status")
     projects = [
-        "openshift-operators",
         "open-cluster-management-agent",
         "open-cluster-management-agent-addon",
         "openshift-gitops",

tests/interop/test_validate_hub_site_components.py

@@ -57,6 +57,8 @@ def test_check_pod_status(openshift_dyn_client):
 
 @pytest.mark.validate_acm_self_registration_managed_clusters
 def test_validate_acm_self_registration_managed_clusters(openshift_dyn_client):
+    if "standalone" in os.getenv("PATTERN_SHORTNAME"):
+        pytest.skip("Standalone config - skipping...")
     logger.info("Check ACM self registration for edge site")
     kubefiles = [os.getenv("KUBECONFIG_EDGE")]
     err_msg = components.validate_acm_self_registration_managed_clusters(