diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-main.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-main.yaml index ae8d74a3d1dd7..939d5002538b1 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-main.yaml @@ -453,6 +453,7 @@ tests: workflow: openshift-e2e-cert-rotation-short-azure - as: e2e-gcp-operator-serial-ote optional: true + shard_count: 2 steps: cluster_profile: gcp env: diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.22.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.22.yaml index 4e4ed34a73a06..83b645c223ac2 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.22.yaml @@ -454,6 +454,7 @@ tests: workflow: openshift-e2e-cert-rotation-short-azure - as: e2e-gcp-operator-serial-ote optional: true + shard_count: 2 steps: cluster_profile: gcp env: diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.23.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.23.yaml index 00c6aabba4eb5..b456c7900e5c2 100644 --- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.23.yaml +++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.23.yaml @@ -453,6 +453,7 @@ tests: workflow: openshift-e2e-cert-rotation-short-azure - as: e2e-gcp-operator-serial-ote optional: true + shard_count: 2 steps: cluster_profile: gcp env: diff --git a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-main-presubmits.yaml index a7491ff20e87d..cc9cbe777a833 100644 --- a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-main-presubmits.yaml @@ -1253,22 +1253,97 @@ presubmits: - ^main$ - ^main- cluster: build08 - context: ci/prow/e2e-gcp-operator-serial-ote + context: ci/prow/e2e-gcp-operator-serial-ote-1of2 decorate: true labels: ci-operator.openshift.io/cloud: gcp ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-kube-apiserver-operator-main-e2e-gcp-operator-serial-ote + name: pull-ci-openshift-cluster-kube-apiserver-operator-main-e2e-gcp-operator-serial-ote-1of2 optional: true - rerun_command: /test e2e-gcp-operator-serial-ote + rerun_command: /test e2e-gcp-operator-serial-ote-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-gcp-operator-serial-ote + 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-gcp-operator-serial-ote-1of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build08 + context: ci/prow/e2e-gcp-operator-serial-ote-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-kube-apiserver-operator-main-e2e-gcp-operator-serial-ote-2of2 + optional: true + rerun_command: /test e2e-gcp-operator-serial-ote-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-gcp-operator-serial-ote @@ -1319,7 +1394,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-operator-serial-ote,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-operator-serial-ote-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.22-presubmits.yaml index 7cb1e34844427..571aef75677e2 100644 --- a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.22-presubmits.yaml @@ -1253,22 +1253,97 @@ presubmits: - ^release-4\.22$ - ^release-4\.22- cluster: build04 - context: ci/prow/e2e-gcp-operator-serial-ote + context: ci/prow/e2e-gcp-operator-serial-ote-1of2 decorate: true labels: ci-operator.openshift.io/cloud: gcp ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.22-e2e-gcp-operator-serial-ote + name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.22-e2e-gcp-operator-serial-ote-1of2 optional: true - rerun_command: /test e2e-gcp-operator-serial-ote + rerun_command: /test e2e-gcp-operator-serial-ote-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-gcp-operator-serial-ote + 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-gcp-operator-serial-ote-1of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build04 + context: ci/prow/e2e-gcp-operator-serial-ote-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.22-e2e-gcp-operator-serial-ote-2of2 + optional: true + rerun_command: /test e2e-gcp-operator-serial-ote-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-gcp-operator-serial-ote @@ -1319,7 +1394,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-operator-serial-ote,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-operator-serial-ote-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.23-presubmits.yaml index c8afe67f8ce90..b5f45adaf1a3b 100644 --- a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.23-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.23-presubmits.yaml @@ -1253,22 +1253,97 @@ presubmits: - ^release-4\.23$ - ^release-4\.23- cluster: build04 - context: ci/prow/e2e-gcp-operator-serial-ote + context: ci/prow/e2e-gcp-operator-serial-ote-1of2 decorate: true labels: ci-operator.openshift.io/cloud: gcp ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.23-e2e-gcp-operator-serial-ote + name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.23-e2e-gcp-operator-serial-ote-1of2 optional: true - rerun_command: /test e2e-gcp-operator-serial-ote + rerun_command: /test e2e-gcp-operator-serial-ote-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-gcp-operator-serial-ote + 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-gcp-operator-serial-ote-1of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.23$ + - ^release-4\.23- + cluster: build04 + context: ci/prow/e2e-gcp-operator-serial-ote-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.23-e2e-gcp-operator-serial-ote-2of2 + optional: true + rerun_command: /test e2e-gcp-operator-serial-ote-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-gcp-operator-serial-ote @@ -1319,7 +1394,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-operator-serial-ote,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-operator-serial-ote-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: