Mark 4.13 storage hypershift jobs as blocking

ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master.yaml

@@ -58,10 +58,9 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-hypershift-conformance
-  optional: true
+- as: hypershift-aws-e2e-external
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: e2e-aws-csi-extended
   optional: true
   steps:

ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12.yaml

@@ -54,10 +54,10 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-hypershift-conformance
+- as: hypershift-aws-e2e-external
   optional: true
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: verify-deps
   steps:
     test:

ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13.yaml

@@ -54,10 +54,9 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-hypershift-conformance
-  optional: true
+- as: hypershift-aws-e2e-external
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: verify-deps
   steps:
     test:

ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14.yaml

@@ -59,10 +59,9 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-hypershift-conformance
-  optional: true
+- as: hypershift-aws-e2e-external
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: e2e-aws-csi-extended
   optional: true
   steps:

ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15.yaml

@@ -58,10 +58,9 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-hypershift-conformance
-  optional: true
+- as: hypershift-aws-e2e-external
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: e2e-aws-csi-extended
   optional: true
   steps:

ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml

@@ -129,10 +129,9 @@ tests:
       CONFIG_TYPE: minimal
       TEST_SUITE: openshift/conformance/parallel
     workflow: openshift-e2e-openstack-ipi
-- as: e2e-hypershift-ovn-conformance
-  optional: true
+- as: hypershift-aws-e2e-external
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: verify-deps
   steps:
     test:

ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12.yaml

@@ -127,10 +127,10 @@ tests:
       CONFIG_TYPE: minimal
       TEST_SUITE: openshift/conformance/parallel
     workflow: openshift-e2e-openstack-ipi
-- as: e2e-hypershift-ovn-conformance
+- as: hypershift-aws-e2e-external
   optional: true
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: verify-deps
   steps:
     test:

ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.14.yaml

@@ -130,10 +130,9 @@ tests:
       CONFIG_TYPE: minimal
       TEST_SUITE: openshift/conformance/parallel
     workflow: openshift-e2e-openstack-ipi
-- as: e2e-hypershift-ovn-conformance
-  optional: true
+- as: hypershift-aws-e2e-external
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: verify-deps
   steps:
     test:

ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.15.yaml

@@ -129,10 +129,9 @@ tests:
       CONFIG_TYPE: minimal
       TEST_SUITE: openshift/conformance/parallel
     workflow: openshift-e2e-openstack-ipi
-- as: e2e-hypershift-ovn-conformance
-  optional: true
+- as: hypershift-aws-e2e-external
   steps:
-    workflow: hypershift-aws-conformance
+    workflow: hypershift-aws-e2e-external
 - as: verify-deps
   steps:
     test:

ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master-presubmits.yaml

@@ -151,22 +151,21 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-hypershift-conformance
+    context: ci/prow/hypershift-aws-e2e-external
     decorate: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-aws-ebs-csi-driver-operator-master-e2e-hypershift-conformance
-    optional: true
-    rerun_command: /test e2e-hypershift-conformance
+    name: pull-ci-openshift-aws-ebs-csi-driver-operator-master-hypershift-aws-e2e-external
+    rerun_command: /test hypershift-aws-e2e-external
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-hypershift-conformance
+        - --target=hypershift-aws-e2e-external
         command:
         - ci-operator
         image: ci-operator:latest
@@ -199,7 +198,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-hypershift-conformance,?($|\s.*)
+    trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12-presubmits.yaml

@@ -78,22 +78,22 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-hypershift-conformance
+    context: ci/prow/hypershift-aws-e2e-external
     decorate: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.12-e2e-hypershift-conformance
+    name: pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.12-hypershift-aws-e2e-external
     optional: true
-    rerun_command: /test e2e-hypershift-conformance
+    rerun_command: /test hypershift-aws-e2e-external
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-hypershift-conformance
+        - --target=hypershift-aws-e2e-external
         command:
         - ci-operator
         image: ci-operator:latest
@@ -126,7 +126,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-hypershift-conformance,?($|\s.*)
+    trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13-presubmits.yaml

@@ -78,22 +78,21 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-hypershift-conformance
+    context: ci/prow/hypershift-aws-e2e-external
     decorate: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.13-e2e-hypershift-conformance
-    optional: true
-    rerun_command: /test e2e-hypershift-conformance
+    name: pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.13-hypershift-aws-e2e-external
+    rerun_command: /test hypershift-aws-e2e-external
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-hypershift-conformance
+        - --target=hypershift-aws-e2e-external
         command:
         - ci-operator
         image: ci-operator:latest
@@ -126,7 +125,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-hypershift-conformance,?($|\s.*)
+    trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14-presubmits.yaml

@@ -151,22 +151,21 @@ presubmits:
     - ^release-4\.14$
     - ^release-4\.14-
     cluster: build03
-    context: ci/prow/e2e-hypershift-conformance
+    context: ci/prow/hypershift-aws-e2e-external
     decorate: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.14-e2e-hypershift-conformance
-    optional: true
-    rerun_command: /test e2e-hypershift-conformance
+    name: pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.14-hypershift-aws-e2e-external
+    rerun_command: /test hypershift-aws-e2e-external
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-hypershift-conformance
+        - --target=hypershift-aws-e2e-external
         command:
         - ci-operator
         image: ci-operator:latest
@@ -199,7 +198,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-hypershift-conformance,?($|\s.*)
+    trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15-presubmits.yaml

@@ -151,22 +151,21 @@ presubmits:
     - ^release-4\.15$
     - ^release-4\.15-
     cluster: build03
-    context: ci/prow/e2e-hypershift-conformance
+    context: ci/prow/hypershift-aws-e2e-external
     decorate: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.15-e2e-hypershift-conformance
-    optional: true
-    rerun_command: /test e2e-hypershift-conformance
+    name: pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.15-hypershift-aws-e2e-external
+    rerun_command: /test hypershift-aws-e2e-external
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-hypershift-conformance
+        - --target=hypershift-aws-e2e-external
         command:
         - ci-operator
         image: ci-operator:latest
@@ -199,7 +198,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-hypershift-conformance,?($|\s.*)
+    trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: