diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml index a29b350ac4eb6..9e778778d5220 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml @@ -449,6 +449,7 @@ tests: workflow: ipi-aws - as: e2e-metal-ipi-ovn-ipv6 cluster: build05 + shard_count: 2 steps: cluster_profile: equinix-ocp-metal env: diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.20.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.20.yaml index 7410f12ce4ce0..4723f3153f3c0 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.20.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.20.yaml @@ -439,6 +439,7 @@ tests: workflow: ipi-aws - as: e2e-metal-ipi-ovn-ipv6 cluster: build05 + shard_count: 2 steps: cluster_profile: equinix-ocp-metal env: diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.21.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.21.yaml index 2bc297c47fc6d..c65ec0529d188 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.21.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.21.yaml @@ -425,6 +425,7 @@ tests: workflow: ipi-aws - as: e2e-metal-ipi-ovn-ipv6 cluster: build05 + shard_count: 2 steps: cluster_profile: equinix-ocp-metal env: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml index 8f7e7686a0486..bded109a92728 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml @@ -1903,7 +1903,7 @@ presubmits: - ^master$ - ^master- cluster: build05 - context: ci/prow/e2e-metal-ipi-ovn-ipv6 + context: ci/prow/e2e-metal-ipi-ovn-ipv6-1of2 decorate: true labels: ci-operator.openshift.io/cloud: equinix-ocp-metal @@ -1911,15 +1911,16 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-kubernetes-master-e2e-metal-ipi-ovn-ipv6 + name: pull-ci-openshift-kubernetes-master-e2e-metal-ipi-ovn-ipv6-1of2 path_alias: k8s.io/kubernetes - rerun_command: /test e2e-metal-ipi-ovn-ipv6 + rerun_command: /test e2e-metal-ipi-ovn-ipv6-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-metal-ipi-ovn-ipv6 @@ -1970,7 +1971,82 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6-1of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-metal-ipi-ovn-ipv6-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-kubernetes-master-e2e-metal-ipi-ovn-ipv6-2of2 + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-metal-ipi-ovn-ipv6-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-metal-ipi-ovn-ipv6 + command: + - ci-operator + image: 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-metal-ipi-ovn-ipv6-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.20-presubmits.yaml index 53c139d455914..3594952878379 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.20-presubmits.yaml @@ -1903,7 +1903,7 @@ presubmits: - ^release-4\.20$ - ^release-4\.20- cluster: build05 - context: ci/prow/e2e-metal-ipi-ovn-ipv6 + context: ci/prow/e2e-metal-ipi-ovn-ipv6-1of2 decorate: true labels: ci-operator.openshift.io/cloud: equinix-ocp-metal @@ -1911,15 +1911,16 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-kubernetes-release-4.20-e2e-metal-ipi-ovn-ipv6 + name: pull-ci-openshift-kubernetes-release-4.20-e2e-metal-ipi-ovn-ipv6-1of2 path_alias: k8s.io/kubernetes - rerun_command: /test e2e-metal-ipi-ovn-ipv6 + rerun_command: /test e2e-metal-ipi-ovn-ipv6-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-metal-ipi-ovn-ipv6 @@ -1970,7 +1971,82 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6-1of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.20$ + - ^release-4\.20- + cluster: build05 + context: ci/prow/e2e-metal-ipi-ovn-ipv6-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-kubernetes-release-4.20-e2e-metal-ipi-ovn-ipv6-2of2 + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-metal-ipi-ovn-ipv6-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-metal-ipi-ovn-ipv6 + command: + - ci-operator + image: 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-metal-ipi-ovn-ipv6-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.21-presubmits.yaml index c63f39f390f74..0dcb423a29a89 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.21-presubmits.yaml @@ -1903,7 +1903,7 @@ presubmits: - ^release-4\.21$ - ^release-4\.21- cluster: build05 - context: ci/prow/e2e-metal-ipi-ovn-ipv6 + context: ci/prow/e2e-metal-ipi-ovn-ipv6-1of2 decorate: true labels: ci-operator.openshift.io/cloud: equinix-ocp-metal @@ -1911,15 +1911,16 @@ presubmits: ci-operator.openshift.io/cluster: build05 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-kubernetes-release-4.21-e2e-metal-ipi-ovn-ipv6 + name: pull-ci-openshift-kubernetes-release-4.21-e2e-metal-ipi-ovn-ipv6-1of2 path_alias: k8s.io/kubernetes - rerun_command: /test e2e-metal-ipi-ovn-ipv6 + rerun_command: /test e2e-metal-ipi-ovn-ipv6-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-metal-ipi-ovn-ipv6 @@ -1970,7 +1971,82 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6-1of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.21$ + - ^release-4\.21- + cluster: build05 + context: ci/prow/e2e-metal-ipi-ovn-ipv6-2of2 + decorate: true + labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-kubernetes-release-4.21-e2e-metal-ipi-ovn-ipv6-2of2 + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-metal-ipi-ovn-ipv6-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-metal-ipi-ovn-ipv6 + command: + - ci-operator + image: 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-metal-ipi-ovn-ipv6-2of2,?($|\s.*) - agent: kubernetes always_run: false branches: