use shard_count for e2e-aws-capi-techpreview jobs

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:

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:

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:

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:

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:

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:

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:

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:

ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-presubmits.yaml

@@ -6,23 +6,99 @@ 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:
       - 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
+    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:

ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21-presubmits.yaml

@@ -6,23 +6,99 @@ 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:
       - 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
+    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: