From df2ee5f117cb2d9991e88f1067c2ddb8eb768f68 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 26 May 2023 14:54:27 +0200 Subject: [PATCH] Mark 4.13 storage hypershift jobs as blocking And use hypershift-aws-e2e-external instead of conformance everywhere. --- ...ft-aws-ebs-csi-driver-operator-master.yaml | 5 +- ...-ebs-csi-driver-operator-release-4.12.yaml | 4 +- ...-ebs-csi-driver-operator-release-4.13.yaml | 5 +- ...-ebs-csi-driver-operator-release-4.14.yaml | 5 +- ...-ebs-csi-driver-operator-release-4.15.yaml | 5 +- ...shift-cluster-storage-operator-master.yaml | 5 +- ...cluster-storage-operator-release-4.12.yaml | 4 +- ...cluster-storage-operator-release-4.14.yaml | 5 +- ...cluster-storage-operator-release-4.15.yaml | 5 +- ...csi-driver-operator-master-presubmits.yaml | 11 +- ...iver-operator-release-4.12-presubmits.yaml | 10 +- ...iver-operator-release-4.13-presubmits.yaml | 11 +- ...iver-operator-release-4.14-presubmits.yaml | 11 +- ...iver-operator-release-4.15-presubmits.yaml | 11 +- ...er-storage-operator-master-presubmits.yaml | 109 +++++++++-------- ...rage-operator-release-4.12-presubmits.yaml | 110 +++++++++--------- ...rage-operator-release-4.14-presubmits.yaml | 109 +++++++++-------- ...rage-operator-release-4.15-presubmits.yaml | 109 +++++++++-------- 18 files changed, 260 insertions(+), 274 deletions(-) diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master.yaml index 122b1fca0a35d..412db694bbbbe 100644 --- a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master.yaml +++ b/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: diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12.yaml index b5f6e82945bce..dbab66dd32440 100644 --- a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12.yaml +++ b/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: diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13.yaml index 31dfc21335210..c9da732995d76 100644 --- a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13.yaml +++ b/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: diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14.yaml index ccdc2033ceb23..f43fdb7c1c2e4 100644 --- a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14.yaml +++ b/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: diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15.yaml index 5887c7557871f..1f43af2f4c956 100644 --- a/ci-operator/config/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15.yaml +++ b/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: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml index fc3e105f1a51a..d19d045af2640 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml +++ b/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: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12.yaml index 4cd24d36ce6e7..48f34f8a9f65b 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12.yaml +++ b/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: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.14.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.14.yaml index 21944d6b3148b..d90a2c7299b19 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.14.yaml +++ b/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: diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.15.yaml index 1d1781aa54d55..ea4101dd773dd 100644 --- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.15.yaml +++ b/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: diff --git a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master-presubmits.yaml index ae3be0f95a597..8f3d5596e22f7 100644 --- a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-master-presubmits.yaml @@ -151,14 +151,13 @@ 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: @@ -166,7 +165,7 @@ presubmits: - --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: diff --git a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12-presubmits.yaml index a796f8fbbdff1..c6223ad719df0 100644 --- a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.12-presubmits.yaml @@ -78,14 +78,14 @@ 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: @@ -93,7 +93,7 @@ presubmits: - --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: diff --git a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13-presubmits.yaml index 74f8d4d457242..33f19fa98f91a 100644 --- a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.13-presubmits.yaml @@ -78,14 +78,13 @@ 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: @@ -93,7 +92,7 @@ presubmits: - --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: diff --git a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14-presubmits.yaml b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14-presubmits.yaml index 7207cdf82304d..310109ed19387 100644 --- a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.14-presubmits.yaml @@ -151,14 +151,13 @@ 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: @@ -166,7 +165,7 @@ presubmits: - --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: diff --git a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15-presubmits.yaml b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15-presubmits.yaml index 8584e9850ebcf..e75728ec862e0 100644 --- a/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15-presubmits.yaml +++ b/ci-operator/jobs/openshift/aws-ebs-csi-driver-operator/openshift-aws-ebs-csi-driver-operator-release-4.15-presubmits.yaml @@ -151,14 +151,13 @@ 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: @@ -166,7 +165,7 @@ presubmits: - --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: diff --git a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master-presubmits.yaml index 325836f3ec0ea..8563dbb9e273c 100644 --- a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master-presubmits.yaml @@ -662,61 +662,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/e2e-hypershift-ovn-conformance - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-storage-operator-master-e2e-hypershift-ovn-conformance - optional: true - rerun_command: /test e2e-hypershift-ovn-conformance - 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-ovn-conformance - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-hypershift-ovn-conformance,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1086,6 +1031,60 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-vsphere-csi,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build02 + 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-cluster-storage-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=hypershift-aws-e2e-external + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12-presubmits.yaml index 2a49342e4680e..e806553176802 100644 --- a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12-presubmits.yaml @@ -662,61 +662,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.12$ - - ^release-4\.12- - cluster: build02 - context: ci/prow/e2e-hypershift-ovn-conformance - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-hypershift-ovn-conformance - optional: true - rerun_command: /test e2e-hypershift-ovn-conformance - 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-ovn-conformance - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-hypershift-ovn-conformance,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1086,6 +1031,61 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-vsphere-ovn,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.12$ + - ^release-4\.12- + cluster: build02 + 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-cluster-storage-operator-release-4.12-hypershift-aws-e2e-external + optional: true + 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=hypershift-aws-e2e-external + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.14-presubmits.yaml b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.14-presubmits.yaml index 94e5143f6324f..5bcdecaced43c 100644 --- a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.14-presubmits.yaml @@ -662,61 +662,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.14$ - - ^release-4\.14- - cluster: build02 - context: ci/prow/e2e-hypershift-ovn-conformance - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-storage-operator-release-4.14-e2e-hypershift-ovn-conformance - optional: true - rerun_command: /test e2e-hypershift-ovn-conformance - 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-ovn-conformance - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-hypershift-ovn-conformance,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1086,6 +1031,60 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-vsphere-csi,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.14$ + - ^release-4\.14- + cluster: build02 + 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-cluster-storage-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=hypershift-aws-e2e-external + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.15-presubmits.yaml b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.15-presubmits.yaml index b316cef2121ac..bc4e159f7a9fd 100644 --- a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.15-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.15-presubmits.yaml @@ -662,61 +662,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.15$ - - ^release-4\.15- - cluster: build02 - context: ci/prow/e2e-hypershift-ovn-conformance - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-storage-operator-release-4.15-e2e-hypershift-ovn-conformance - optional: true - rerun_command: /test e2e-hypershift-ovn-conformance - 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-ovn-conformance - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-hypershift-ovn-conformance,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1086,6 +1031,60 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-vsphere-csi,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.15$ + - ^release-4\.15- + cluster: build02 + 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-cluster-storage-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=hypershift-aws-e2e-external + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*) - agent: kubernetes always_run: true branches: