Skip to content

Commit 521641e

Browse files
committed
use shard_count for e2e-aws-capi-techpreview jobs on some clusterinfra repos
1 parent 32bdb1a commit 521641e

16 files changed

+648
-32
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ tests:
6969
container:
7070
from: src
7171
- as: e2e-aws-capi-techpreview
72+
shard_count: 2
7273
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
7374
steps:
7475
cluster_profile: aws-2

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ tests:
6969
container:
7070
from: src
7171
- as: e2e-aws-capi-techpreview
72+
shard_count: 2
7273
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
7374
steps:
7475
cluster_profile: aws-2

ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.22.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ tests:
7070
container:
7171
from: src
7272
- as: e2e-aws-capi-techpreview
73+
shard_count: 2
7374
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
7475
steps:
7576
cluster_profile: aws-2

ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.23.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ tests:
6969
container:
7070
from: src
7171
- as: e2e-aws-capi-techpreview
72+
shard_count: 2
7273
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
7374
steps:
7475
cluster_profile: aws-2

ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ tests:
114114
- always_run: false
115115
as: e2e-aws-capi-techpreview
116116
pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/
117+
shard_count: 2
117118
steps:
118119
cluster_profile: aws-5
119120
env:

ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ tests:
114114
- always_run: false
115115
as: e2e-aws-capi-techpreview
116116
pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/
117+
shard_count: 2
117118
steps:
118119
cluster_profile: aws-5
119120
env:

ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.22.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ tests:
115115
- always_run: false
116116
as: e2e-aws-capi-techpreview
117117
pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/
118+
shard_count: 2
118119
steps:
119120
cluster_profile: aws-5
120121
env:

ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ tests:
114114
- always_run: false
115115
as: e2e-aws-capi-techpreview
116116
pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/
117+
shard_count: 2
117118
steps:
118119
cluster_profile: aws-5
119120
env:

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

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,99 @@ presubmits:
66
- ^main$
77
- ^main-
88
cluster: build03
9-
context: ci/prow/e2e-aws-capi-techpreview
9+
context: ci/prow/e2e-aws-capi-techpreview-1of2
1010
decorate: true
1111
labels:
1212
ci-operator.openshift.io/cloud: aws
1313
ci-operator.openshift.io/cloud-cluster-profile: aws-2
1414
ci.openshift.io/generator: prowgen
1515
pj-rehearse.openshift.io/can-be-rehearsed: "true"
16-
name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-capi-techpreview
16+
name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-capi-techpreview-1of2
1717
path_alias: sigs.k8s.io/cluster-api-provider-aws
18-
rerun_command: /test e2e-aws-capi-techpreview
18+
rerun_command: /test e2e-aws-capi-techpreview-1of2
1919
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
2020
spec:
2121
containers:
2222
- args:
2323
- --gcs-upload-secret=/secrets/gcs/service-account.json
2424
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2525
- --lease-server-credentials-file=/etc/boskos/credentials
26+
- --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1"
27+
- --report-credentials-file=/etc/report/credentials
28+
- --secret-dir=/secrets/ci-pull-credentials
29+
- --target=e2e-aws-capi-techpreview
30+
command:
31+
- ci-operator
32+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
33+
imagePullPolicy: Always
34+
name: ""
35+
resources:
36+
requests:
37+
cpu: 10m
38+
volumeMounts:
39+
- mountPath: /etc/boskos
40+
name: boskos
41+
readOnly: true
42+
- mountPath: /secrets/ci-pull-credentials
43+
name: ci-pull-credentials
44+
readOnly: true
45+
- mountPath: /secrets/gcs
46+
name: gcs-credentials
47+
readOnly: true
48+
- mountPath: /secrets/manifest-tool
49+
name: manifest-tool-local-pusher
50+
readOnly: true
51+
- mountPath: /etc/pull-secret
52+
name: pull-secret
53+
readOnly: true
54+
- mountPath: /etc/report
55+
name: result-aggregator
56+
readOnly: true
57+
serviceAccountName: ci-operator
58+
volumes:
59+
- name: boskos
60+
secret:
61+
items:
62+
- key: credentials
63+
path: credentials
64+
secretName: boskos-credentials
65+
- name: ci-pull-credentials
66+
secret:
67+
secretName: ci-pull-credentials
68+
- name: manifest-tool-local-pusher
69+
secret:
70+
secretName: manifest-tool-local-pusher
71+
- name: pull-secret
72+
secret:
73+
secretName: registry-pull-credentials
74+
- name: result-aggregator
75+
secret:
76+
secretName: result-aggregator
77+
trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*)
78+
- agent: kubernetes
79+
always_run: false
80+
branches:
81+
- ^main$
82+
- ^main-
83+
cluster: build03
84+
context: ci/prow/e2e-aws-capi-techpreview-2of2
85+
decorate: true
86+
labels:
87+
ci-operator.openshift.io/cloud: aws
88+
ci-operator.openshift.io/cloud-cluster-profile: aws-2
89+
ci.openshift.io/generator: prowgen
90+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
91+
name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-capi-techpreview-2of2
92+
path_alias: sigs.k8s.io/cluster-api-provider-aws
93+
rerun_command: /test e2e-aws-capi-techpreview-2of2
94+
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
95+
spec:
96+
containers:
97+
- args:
98+
- --gcs-upload-secret=/secrets/gcs/service-account.json
99+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
100+
- --lease-server-credentials-file=/etc/boskos/credentials
101+
- --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2"
26102
- --report-credentials-file=/etc/report/credentials
27103
- --secret-dir=/secrets/ci-pull-credentials
28104
- --target=e2e-aws-capi-techpreview
@@ -73,7 +149,7 @@ presubmits:
73149
- name: result-aggregator
74150
secret:
75151
secretName: result-aggregator
76-
trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*)
152+
trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*)
77153
- agent: kubernetes
78154
always_run: false
79155
branches:

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

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,99 @@ presubmits:
66
- ^release-4\.21$
77
- ^release-4\.21-
88
cluster: build06
9-
context: ci/prow/e2e-aws-capi-techpreview
9+
context: ci/prow/e2e-aws-capi-techpreview-1of2
1010
decorate: true
1111
labels:
1212
ci-operator.openshift.io/cloud: aws
1313
ci-operator.openshift.io/cloud-cluster-profile: aws-2
1414
ci.openshift.io/generator: prowgen
1515
pj-rehearse.openshift.io/can-be-rehearsed: "true"
16-
name: pull-ci-openshift-cluster-api-provider-aws-release-4.21-e2e-aws-capi-techpreview
16+
name: pull-ci-openshift-cluster-api-provider-aws-release-4.21-e2e-aws-capi-techpreview-1of2
1717
path_alias: sigs.k8s.io/cluster-api-provider-aws
18-
rerun_command: /test e2e-aws-capi-techpreview
18+
rerun_command: /test e2e-aws-capi-techpreview-1of2
1919
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
2020
spec:
2121
containers:
2222
- args:
2323
- --gcs-upload-secret=/secrets/gcs/service-account.json
2424
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2525
- --lease-server-credentials-file=/etc/boskos/credentials
26+
- --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1"
27+
- --report-credentials-file=/etc/report/credentials
28+
- --secret-dir=/secrets/ci-pull-credentials
29+
- --target=e2e-aws-capi-techpreview
30+
command:
31+
- ci-operator
32+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
33+
imagePullPolicy: Always
34+
name: ""
35+
resources:
36+
requests:
37+
cpu: 10m
38+
volumeMounts:
39+
- mountPath: /etc/boskos
40+
name: boskos
41+
readOnly: true
42+
- mountPath: /secrets/ci-pull-credentials
43+
name: ci-pull-credentials
44+
readOnly: true
45+
- mountPath: /secrets/gcs
46+
name: gcs-credentials
47+
readOnly: true
48+
- mountPath: /secrets/manifest-tool
49+
name: manifest-tool-local-pusher
50+
readOnly: true
51+
- mountPath: /etc/pull-secret
52+
name: pull-secret
53+
readOnly: true
54+
- mountPath: /etc/report
55+
name: result-aggregator
56+
readOnly: true
57+
serviceAccountName: ci-operator
58+
volumes:
59+
- name: boskos
60+
secret:
61+
items:
62+
- key: credentials
63+
path: credentials
64+
secretName: boskos-credentials
65+
- name: ci-pull-credentials
66+
secret:
67+
secretName: ci-pull-credentials
68+
- name: manifest-tool-local-pusher
69+
secret:
70+
secretName: manifest-tool-local-pusher
71+
- name: pull-secret
72+
secret:
73+
secretName: registry-pull-credentials
74+
- name: result-aggregator
75+
secret:
76+
secretName: result-aggregator
77+
trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-1of2,?($|\s.*)
78+
- agent: kubernetes
79+
always_run: false
80+
branches:
81+
- ^release-4\.21$
82+
- ^release-4\.21-
83+
cluster: build06
84+
context: ci/prow/e2e-aws-capi-techpreview-2of2
85+
decorate: true
86+
labels:
87+
ci-operator.openshift.io/cloud: aws
88+
ci-operator.openshift.io/cloud-cluster-profile: aws-2
89+
ci.openshift.io/generator: prowgen
90+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
91+
name: pull-ci-openshift-cluster-api-provider-aws-release-4.21-e2e-aws-capi-techpreview-2of2
92+
path_alias: sigs.k8s.io/cluster-api-provider-aws
93+
rerun_command: /test e2e-aws-capi-techpreview-2of2
94+
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
95+
spec:
96+
containers:
97+
- args:
98+
- --gcs-upload-secret=/secrets/gcs/service-account.json
99+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
100+
- --lease-server-credentials-file=/etc/boskos/credentials
101+
- --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2"
26102
- --report-credentials-file=/etc/report/credentials
27103
- --secret-dir=/secrets/ci-pull-credentials
28104
- --target=e2e-aws-capi-techpreview
@@ -73,7 +149,7 @@ presubmits:
73149
- name: result-aggregator
74150
secret:
75151
secretName: result-aggregator
76-
trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*)
152+
trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview-2of2,?($|\s.*)
77153
- agent: kubernetes
78154
always_run: false
79155
branches:

0 commit comments

Comments
 (0)