From 2caba09e5c93eb1f67d612fa885b950455183c13 Mon Sep 17 00:00:00 2001 From: Zhaohua Sun Date: Wed, 7 Jan 2026 12:04:22 +0800 Subject: [PATCH] use shard_count for e2e-aws-capi-techpreview jobs on some clusterinfra repos --- ...enshift-cluster-api-provider-aws-main.yaml | 4 + ...cluster-api-provider-aws-release-4.21.yaml | 4 + ...cluster-api-provider-aws-release-4.22.yaml | 4 + ...cluster-api-provider-aws-release-4.23.yaml | 4 + .../openshift-cluster-capi-operator-main.yaml | 4 + ...ft-cluster-capi-operator-release-4.21.yaml | 4 + ...ft-cluster-capi-operator-release-4.22.yaml | 4 + ...ft-cluster-capi-operator-release-4.23.yaml | 4 + ...ster-api-provider-aws-main-presubmits.yaml | 84 ++++++++++++++++++- ...-provider-aws-release-4.21-presubmits.yaml | 84 ++++++++++++++++++- ...-provider-aws-release-4.22-presubmits.yaml | 84 ++++++++++++++++++- ...-provider-aws-release-4.23-presubmits.yaml | 84 ++++++++++++++++++- ...cluster-capi-operator-main-presubmits.yaml | 84 ++++++++++++++++++- ...capi-operator-release-4.21-presubmits.yaml | 84 ++++++++++++++++++- ...capi-operator-release-4.22-presubmits.yaml | 84 ++++++++++++++++++- ...capi-operator-release-4.23-presubmits.yaml | 84 ++++++++++++++++++- 16 files changed, 672 insertions(+), 32 deletions(-) diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml index 6fc7923278ae5..508c20ae8e151 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml @@ -69,6 +69,7 @@ tests: container: from: src - as: e2e-aws-capi-techpreview + shard_count: 2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: aws-2 @@ -80,6 +81,9 @@ tests: test: - as: test commands: openshift/e2e-tests.sh + env: + - default: "" + name: SHARD_ARGS from: src resources: requests: diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21.yaml index 24836d4560ce8..58fe3a5cc0b16 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21.yaml @@ -69,6 +69,7 @@ tests: container: from: src - as: e2e-aws-capi-techpreview + shard_count: 2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: aws-2 @@ -80,6 +81,9 @@ tests: test: - as: test commands: openshift/e2e-tests.sh + env: + - default: "" + name: SHARD_ARGS from: src resources: requests: diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22.yaml index 7fc44389866de..2702bfa7bd071 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22.yaml @@ -70,6 +70,7 @@ tests: container: from: src - as: e2e-aws-capi-techpreview + shard_count: 2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: aws-2 @@ -81,6 +82,9 @@ tests: test: - as: test commands: openshift/e2e-tests.sh + env: + - default: "" + name: SHARD_ARGS from: src resources: requests: diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23.yaml index 950ddf2de46e1..586cae2caf433 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23.yaml @@ -69,6 +69,7 @@ tests: container: from: src - as: e2e-aws-capi-techpreview + shard_count: 2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: aws-2 @@ -80,6 +81,9 @@ tests: test: - as: test commands: openshift/e2e-tests.sh + env: + - default: "" + name: SHARD_ARGS from: src resources: requests: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml index 58bf5ed9477b4..a7777388e8d73 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml @@ -114,6 +114,7 @@ tests: - always_run: false as: e2e-aws-capi-techpreview pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/ + shard_count: 2 steps: cluster_profile: aws-5 env: @@ -124,6 +125,9 @@ tests: test: - as: test commands: make e2e + env: + - default: "" + name: SHARD_ARGS from: src resources: requests: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml index 7e0ce704da1f0..3f11c64d1b37a 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml @@ -114,6 +114,7 @@ tests: - always_run: false as: e2e-aws-capi-techpreview pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/ + shard_count: 2 steps: cluster_profile: aws-5 env: @@ -124,6 +125,9 @@ tests: test: - as: test commands: make e2e + env: + - default: "" + name: SHARD_ARGS from: src resources: requests: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22.yaml index db0b492f41e47..ae33b12250dda 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22.yaml @@ -115,6 +115,7 @@ tests: - always_run: false as: e2e-aws-capi-techpreview pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/ + shard_count: 2 steps: cluster_profile: aws-5 env: @@ -125,6 +126,9 @@ tests: test: - as: test commands: make e2e + env: + - default: "" + name: SHARD_ARGS from: src resources: requests: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml index 661e230f3e29e..e8fa59e494465 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml @@ -114,6 +114,7 @@ tests: - always_run: false as: e2e-aws-capi-techpreview pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/ + shard_count: 2 steps: cluster_profile: aws-5 env: @@ -124,6 +125,9 @@ tests: test: - as: test commands: make e2e + env: + - default: "" + name: SHARD_ARGS from: src resources: requests: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-presubmits.yaml index d78925a53e5bd..660c5ce955fe7 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-capi-techpreview-1of2 decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-capi-techpreview-1of2 path_alias: sigs.k8s.io/cluster-api-provider-aws - rerun_command: /test e2e-aws-capi-techpreview + rerun_command: /test e2e-aws-capi-techpreview-1of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: @@ -23,6 +23,82 @@ presubmits: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-capi-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build03 + context: ci/prow/e2e-aws-capi-techpreview-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-capi-techpreview-2of2 + path_alias: sigs.k8s.io/cluster-api-provider-aws + rerun_command: /test e2e-aws-capi-techpreview-2of2 + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-capi-techpreview @@ -73,7 +149,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21-presubmits.yaml index 31c16fb2d4237..62100834c2cd7 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^release-4\.21$ - ^release-4\.21- cluster: build06 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-capi-techpreview-1of2 decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-provider-aws-release-4.21-e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-api-provider-aws-release-4.21-e2e-aws-capi-techpreview-1of2 path_alias: sigs.k8s.io/cluster-api-provider-aws - rerun_command: /test e2e-aws-capi-techpreview + rerun_command: /test e2e-aws-capi-techpreview-1of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: @@ -23,6 +23,82 @@ presubmits: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-capi-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.21$ + - ^release-4\.21- + cluster: build06 + context: ci/prow/e2e-aws-capi-techpreview-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-aws-release-4.21-e2e-aws-capi-techpreview-2of2 + path_alias: sigs.k8s.io/cluster-api-provider-aws + rerun_command: /test e2e-aws-capi-techpreview-2of2 + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-capi-techpreview @@ -73,7 +149,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22-presubmits.yaml index 9db761e41b13c..dd21eb12c3073 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^release-4\.22$ - ^release-4\.22- cluster: build06 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-capi-techpreview-1of2 decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-provider-aws-release-4.22-e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-api-provider-aws-release-4.22-e2e-aws-capi-techpreview-1of2 path_alias: sigs.k8s.io/cluster-api-provider-aws - rerun_command: /test e2e-aws-capi-techpreview + rerun_command: /test e2e-aws-capi-techpreview-1of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: @@ -23,6 +23,82 @@ presubmits: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-capi-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build06 + context: ci/prow/e2e-aws-capi-techpreview-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-aws-release-4.22-e2e-aws-capi-techpreview-2of2 + path_alias: sigs.k8s.io/cluster-api-provider-aws + rerun_command: /test e2e-aws-capi-techpreview-2of2 + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-capi-techpreview @@ -73,7 +149,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23-presubmits.yaml index 65572b60e9df0..e9bd12c7e0773 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^release-4\.23$ - ^release-4\.23- cluster: build06 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-capi-techpreview-1of2 decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-provider-aws-release-4.23-e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-api-provider-aws-release-4.23-e2e-aws-capi-techpreview-1of2 path_alias: sigs.k8s.io/cluster-api-provider-aws - rerun_command: /test e2e-aws-capi-techpreview + rerun_command: /test e2e-aws-capi-techpreview-1of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: @@ -23,6 +23,82 @@ presubmits: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-capi-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.23$ + - ^release-4\.23- + cluster: build06 + context: ci/prow/e2e-aws-capi-techpreview-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-aws-release-4.23-e2e-aws-capi-techpreview-2of2 + path_alias: sigs.k8s.io/cluster-api-provider-aws + rerun_command: /test e2e-aws-capi-techpreview-2of2 + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-capi-techpreview @@ -73,7 +149,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml index bf43025ca138a..9b4747046f758 100644 --- a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml @@ -61,21 +61,97 @@ presubmits: - ^main$ - ^main- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-capi-techpreview-1of2 decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-techpreview-1of2 + rerun_command: /test e2e-aws-capi-techpreview-1of2 spec: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-capi-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*) + - agent: kubernetes + always_run: false + annotations: + pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/ + branches: + - ^main$ + - ^main- + cluster: build07 + context: ci/prow/e2e-aws-capi-techpreview-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-5 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-techpreview-2of2 + rerun_command: /test e2e-aws-capi-techpreview-2of2 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-capi-techpreview @@ -126,7 +202,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*) - agent: kubernetes always_run: false annotations: diff --git a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21-presubmits.yaml index 7e157a716d6e2..17e14cd3df72c 100644 --- a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21-presubmits.yaml @@ -61,21 +61,97 @@ presubmits: - ^release-4\.21$ - ^release-4\.21- cluster: build01 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-capi-techpreview-1of2 decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-capi-operator-release-4.21-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-capi-operator-release-4.21-e2e-aws-capi-techpreview-1of2 + rerun_command: /test e2e-aws-capi-techpreview-1of2 spec: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-capi-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*) + - agent: kubernetes + always_run: false + annotations: + pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/ + branches: + - ^release-4\.21$ + - ^release-4\.21- + cluster: build01 + context: ci/prow/e2e-aws-capi-techpreview-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-5 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-capi-operator-release-4.21-e2e-aws-capi-techpreview-2of2 + rerun_command: /test e2e-aws-capi-techpreview-2of2 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-capi-techpreview @@ -126,7 +202,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*) - agent: kubernetes always_run: false annotations: diff --git a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22-presubmits.yaml index 7d0a8eb3602cf..810abf2e61e2d 100644 --- a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22-presubmits.yaml @@ -61,21 +61,97 @@ presubmits: - ^release-4\.22$ - ^release-4\.22- cluster: build01 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-capi-techpreview-1of2 decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-capi-operator-release-4.22-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-capi-operator-release-4.22-e2e-aws-capi-techpreview-1of2 + rerun_command: /test e2e-aws-capi-techpreview-1of2 spec: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-capi-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*) + - agent: kubernetes + always_run: false + annotations: + pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/ + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build01 + context: ci/prow/e2e-aws-capi-techpreview-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-5 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-capi-operator-release-4.22-e2e-aws-capi-techpreview-2of2 + rerun_command: /test e2e-aws-capi-techpreview-2of2 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-capi-techpreview @@ -126,7 +202,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*) - agent: kubernetes always_run: false annotations: diff --git a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23-presubmits.yaml index 126a840e32f51..df6a396dee2d4 100644 --- a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23-presubmits.yaml @@ -61,21 +61,97 @@ presubmits: - ^release-4\.23$ - ^release-4\.23- cluster: build01 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-capi-techpreview-1of2 decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-capi-operator-release-4.23-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-capi-operator-release-4.23-e2e-aws-capi-techpreview-1of2 + rerun_command: /test e2e-aws-capi-techpreview-1of2 spec: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-capi-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*) + - agent: kubernetes + always_run: false + annotations: + pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/ + branches: + - ^release-4\.23$ + - ^release-4\.23- + cluster: build01 + context: ci/prow/e2e-aws-capi-techpreview-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-5 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-capi-operator-release-4.23-e2e-aws-capi-techpreview-2of2 + rerun_command: /test e2e-aws-capi-techpreview-2of2 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-capi-techpreview @@ -126,7 +202,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*) - agent: kubernetes always_run: false annotations: