Skip to content

Commit f2cb100

Browse files
authored
Merge pull request #35357 from nrb/capa-job-fixes
Allow CAPA maintainers to rerun jobs and remove old job
2 parents aff4bb1 + 18a51ff commit f2cb100

File tree

4 files changed

+76
-45
lines changed

4 files changed

+76
-45
lines changed

config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-periodics.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ periodics:
44
decorate: true
55
decoration_config:
66
timeout: 5h
7+
rerun_auth_config:
8+
github_team_slugs:
9+
- org: kubernetes-sigs
10+
slug: cluster-api-provider-aws-maintainers
711
interval: 12h
812
labels:
913
preset-dind-enabled: "true"
@@ -49,6 +53,10 @@ periodics:
4953
decorate: true
5054
decoration_config:
5155
timeout: 5h
56+
rerun_auth_config:
57+
github_team_slugs:
58+
- org: kubernetes-sigs
59+
slug: cluster-api-provider-aws-maintainers
5260
interval: 12h
5361
labels:
5462
preset-dind-enabled: "true"
@@ -93,6 +101,10 @@ periodics:
93101
decorate: true
94102
decoration_config:
95103
timeout: 5h
104+
rerun_auth_config:
105+
github_team_slugs:
106+
- org: kubernetes-sigs
107+
slug: cluster-api-provider-aws-maintainers
96108
interval: 12h
97109
labels:
98110
preset-dind-enabled: "true"
@@ -135,6 +147,10 @@ periodics:
135147
decorate: true
136148
decoration_config:
137149
timeout: 5h
150+
rerun_auth_config:
151+
github_team_slugs:
152+
- org: kubernetes-sigs
153+
slug: cluster-api-provider-aws-maintainers
138154
interval: 12h
139155
labels:
140156
preset-dind-enabled: "true"
@@ -187,6 +203,10 @@ periodics:
187203
decorate: true
188204
decoration_config:
189205
timeout: 5h
206+
rerun_auth_config:
207+
github_team_slugs:
208+
- org: kubernetes-sigs
209+
slug: cluster-api-provider-aws-maintainers
190210
interval: 12h
191211
extra_refs:
192212
- org: kubernetes-sigs
@@ -238,6 +258,10 @@ periodics:
238258
cluster: eks-prow-build-cluster
239259
interval: 24h
240260
decorate: true
261+
rerun_auth_config:
262+
github_team_slugs:
263+
- org: kubernetes-sigs
264+
slug: cluster-api-provider-aws-maintainers
241265
path_alias: "sigs.k8s.io/cluster-api-provider-aws"
242266
extra_refs:
243267
- org: kubernetes-sigs

config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-postsubmits.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ postsubmits:
99
decorate: true
1010
decoration_config:
1111
timeout: 5h
12+
rerun_auth_config:
13+
github_team_slugs:
14+
- org: kubernetes-sigs
15+
slug: cluster-api-provider-aws-maintainers
1216
max_concurrency: 1
1317
labels:
1418
preset-dind-enabled: "true"
@@ -53,6 +57,10 @@ postsubmits:
5357
decorate: true
5458
decoration_config:
5559
timeout: 5h
60+
rerun_auth_config:
61+
github_team_slugs:
62+
- org: kubernetes-sigs
63+
slug: cluster-api-provider-aws-maintainers
5664
max_concurrency: 1
5765
labels:
5866
preset-dind-enabled: "true"
@@ -95,6 +103,10 @@ postsubmits:
95103
decorate: true
96104
decoration_config:
97105
timeout: 5h
106+
rerun_auth_config:
107+
github_team_slugs:
108+
- org: kubernetes-sigs
109+
slug: cluster-api-provider-aws-maintainers
98110
max_concurrency: 1
99111
labels:
100112
preset-dind-enabled: "true"

config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-presubmits-release-2.7.yaml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -193,51 +193,6 @@ presubmits:
193193
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-provider-aws
194194
testgrid-tab-name: pr-conformance-release-2-7
195195
testgrid-num-columns-recent: '20'
196-
# conformance test against kubernetes main branch with `kind` + cluster-api-provider-aws
197-
- name: pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts-release-2-7
198-
cluster: eks-prow-build-cluster
199-
branches:
200-
# The script this job runs is not in all branches.
201-
- ^release-2.7$
202-
path_alias: "sigs.k8s.io/cluster-api-provider-aws"
203-
always_run: false
204-
optional: true
205-
decorate: true
206-
decoration_config:
207-
timeout: 5h
208-
max_concurrency: 1
209-
labels:
210-
preset-dind-enabled: "true"
211-
preset-kind-volume-mounts: "true"
212-
preset-service-account: "true"
213-
preset-aws-ssh: "true"
214-
preset-aws-credential: "true"
215-
spec:
216-
containers:
217-
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-1.30
218-
command:
219-
- "runner.sh"
220-
- "./scripts/ci-conformance.sh"
221-
env:
222-
- name: BOSKOS_HOST
223-
value: "boskos.test-pods.svc.cluster.local"
224-
- name: AWS_REGION
225-
value: "us-west-2"
226-
- name: E2E_ARGS
227-
value: "-kubetest.use-ci-artifacts"
228-
securityContext:
229-
privileged: true
230-
resources:
231-
requests:
232-
cpu: 2
233-
memory: "9Gi"
234-
limits:
235-
cpu: 2
236-
memory: "9Gi"
237-
annotations:
238-
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-provider-aws
239-
testgrid-tab-name: pr-conformance-release-2-7-k8s-main
240-
testgrid-num-columns-recent: '20'
241196
- name: pull-cluster-api-provider-aws-e2e-blocking-release-2-7
242197
cluster: eks-prow-build-cluster
243198
branches:

config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-presubmits.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ presubmits:
88
always_run: true
99
optional: false
1010
decorate: true
11+
rerun_auth_config:
12+
github_team_slugs:
13+
- org: kubernetes-sigs
14+
slug: cluster-api-provider-aws-maintainers
1115
path_alias: "sigs.k8s.io/cluster-api-provider-aws"
1216
spec:
1317
containers:
@@ -27,6 +31,10 @@ presubmits:
2731
- name: pull-cluster-api-provider-aws-apidiff-main
2832
cluster: eks-prow-build-cluster
2933
decorate: true
34+
rerun_auth_config:
35+
github_team_slugs:
36+
- org: kubernetes-sigs
37+
slug: cluster-api-provider-aws-maintainers
3038
path_alias: sigs.k8s.io/cluster-api-provider-aws
3139
always_run: true
3240
optional: true
@@ -80,6 +88,10 @@ presubmits:
8088
always_run: true
8189
optional: false
8290
decorate: true
91+
rerun_auth_config:
92+
github_team_slugs:
93+
- org: kubernetes-sigs
94+
slug: cluster-api-provider-aws-maintainers
8395
path_alias: "sigs.k8s.io/cluster-api-provider-aws"
8496
spec:
8597
containers:
@@ -150,6 +162,10 @@ presubmits:
150162
decorate: true
151163
decoration_config:
152164
timeout: 5h
165+
rerun_auth_config:
166+
github_team_slugs:
167+
- org: kubernetes-sigs
168+
slug: cluster-api-provider-aws-maintainers
153169
max_concurrency: 1
154170
extra_refs:
155171
- org: kubernetes-sigs
@@ -199,6 +215,10 @@ presubmits:
199215
decorate: true
200216
decoration_config:
201217
timeout: 5h
218+
rerun_auth_config:
219+
github_team_slugs:
220+
- org: kubernetes-sigs
221+
slug: cluster-api-provider-aws-maintainers
202222
max_concurrency: 1
203223
labels:
204224
preset-dind-enabled: "true"
@@ -244,6 +264,10 @@ presubmits:
244264
decorate: true
245265
decoration_config:
246266
timeout: 2h
267+
rerun_auth_config:
268+
github_team_slugs:
269+
- org: kubernetes-sigs
270+
slug: cluster-api-provider-aws-maintainers
247271
max_concurrency: 3
248272
labels:
249273
preset-dind-enabled: "true"
@@ -291,6 +315,10 @@ presubmits:
291315
decorate: true
292316
decoration_config:
293317
timeout: 5h
318+
rerun_auth_config:
319+
github_team_slugs:
320+
- org: kubernetes-sigs
321+
slug: cluster-api-provider-aws-maintainers
294322
max_concurrency: 2
295323
labels:
296324
preset-dind-enabled: "true"
@@ -333,6 +361,10 @@ presubmits:
333361
decorate: true
334362
decoration_config:
335363
timeout: 5h
364+
rerun_auth_config:
365+
github_team_slugs:
366+
- org: kubernetes-sigs
367+
slug: cluster-api-provider-aws-maintainers
336368
max_concurrency: 2
337369
labels:
338370
preset-dind-enabled: "true"
@@ -375,6 +407,10 @@ presubmits:
375407
decorate: true
376408
decoration_config:
377409
timeout: 5h
410+
rerun_auth_config:
411+
github_team_slugs:
412+
- org: kubernetes-sigs
413+
slug: cluster-api-provider-aws-maintainers
378414
max_concurrency: 1
379415
labels:
380416
preset-dind-enabled: "true"
@@ -417,6 +453,10 @@ presubmits:
417453
decorate: true
418454
decoration_config:
419455
timeout: 5h
456+
rerun_auth_config:
457+
github_team_slugs:
458+
- org: kubernetes-sigs
459+
slug: cluster-api-provider-aws-maintainers
420460
max_concurrency: 1
421461
labels:
422462
preset-dind-enabled: "true"

0 commit comments

Comments
 (0)