openshift · openshift-merge-bot · Jul 8, 2026 · Jul 7, 2026
diff --git a/...ator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-main.yaml b/...ator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-main.yaml
@@ -44,7 +44,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.15.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.15.yaml
@@ -35,7 +35,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.16.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.16.yaml
@@ -35,7 +35,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.17.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.17.yaml
@@ -35,7 +35,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.18.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.18.yaml
@@ -35,7 +35,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.19.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.19.yaml
@@ -35,7 +35,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.20.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.20.yaml
@@ -35,7 +35,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.21.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.21.yaml
@@ -35,7 +35,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.22.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.22.yaml
@@ -35,7 +35,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.23.yaml b/...fig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.23.yaml
@@ -44,7 +44,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...nfig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-5.0.yaml b/...nfig/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-5.0.yaml
@@ -45,7 +45,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-conformance

diff --git a/...or/config/openshift/aws-encryption-provider/openshift-aws-encryption-provider-master.yaml b/...or/config/openshift/aws-encryption-provider/openshift-aws-encryption-provider-master.yaml
@@ -51,7 +51,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.16.yaml b/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.16.yaml
@@ -42,7 +42,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.17.yaml b/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.17.yaml
@@ -42,7 +42,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.18.yaml b/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.18.yaml
@@ -42,7 +42,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.19.yaml b/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.19.yaml
@@ -42,7 +42,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.20.yaml b/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.20.yaml
@@ -42,7 +42,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.21.yaml b/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.21.yaml
@@ -42,7 +42,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.22.yaml b/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.22.yaml
@@ -42,7 +42,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.23.yaml b/...fig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-4.23.yaml
@@ -51,7 +51,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...nfig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-5.0.yaml b/...nfig/openshift/aws-encryption-provider/openshift-aws-encryption-provider-release-5.0.yaml
@@ -52,7 +52,8 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/.../config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master.yaml b/.../config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.15.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.15.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.16.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.16.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.17.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.17.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.18.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.18.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.19.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.19.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.20.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.20.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.21.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.21.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.22.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.22.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.23.yaml b/...g/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.23.yaml
@@ -35,7 +35,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/...ig/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-5.0.yaml b/...ig/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-5.0.yaml
@@ -36,7 +36,8 @@ tests:
       SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high
       SNYK_ENABLE_DEPS_SCAN: "true"
     workflow: openshift-ci-security
-- as: e2e-aws
+- always_run: false
+  as: e2e-aws
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws

diff --git a/ci-operator/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-main.yaml b/ci-operator/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-main.yaml
@@ -46,7 +46,8 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.16.yaml b/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.16.yaml
@@ -37,7 +37,8 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.17.yaml b/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.17.yaml
@@ -37,7 +37,8 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.18.yaml b/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.18.yaml
@@ -37,7 +37,8 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.19.yaml b/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.19.yaml
@@ -37,7 +37,8 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.20.yaml b/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.20.yaml
@@ -37,7 +37,8 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.21.yaml b/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.21.yaml
@@ -37,7 +37,8 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external

diff --git a/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.22.yaml b/...or/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-release-4.22.yaml
@@ -37,7 +37,8 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: e2e-hypershift
+- always_run: false
+  as: e2e-hypershift
   steps:
     cluster_profile: hypershift-aws
     workflow: hypershift-aws-e2e-external