Skip to content

Commit 2159273

Browse files
OCPBUGS-52395: run 'make jobs'
1 parent 3b24254 commit 2159273

4 files changed

+64
-65
lines changed

ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master-postsubmits.yaml ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main-postsubmits.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ postsubmits:
33
- agent: kubernetes
44
always_run: true
55
branches:
6-
- ^master$
7-
cluster: build07
6+
- ^main$
7+
cluster: build03
88
decorate: true
99
decoration_config:
1010
oauth_token_secret:
@@ -15,7 +15,7 @@ postsubmits:
1515
ci-operator.openshift.io/is-promotion: "true"
1616
ci.openshift.io/generator: prowgen
1717
max_concurrency: 1
18-
name: branch-ci-openshift-priv-oauth-proxy-master-images
18+
name: branch-ci-openshift-priv-oauth-proxy-main-images
1919
path_alias: github.com/openshift/oauth-proxy
2020
spec:
2121
containers:

ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master-presubmits.yaml ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main-presubmits.yaml

+23-23
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ presubmits:
33
- agent: kubernetes
44
always_run: true
55
branches:
6-
- ^master$
7-
- ^master-
8-
cluster: build01
6+
- ^main$
7+
- ^main-
8+
cluster: build09
99
context: ci/prow/e2e-aws
1010
decorate: true
1111
decoration_config:
@@ -18,7 +18,7 @@ presubmits:
1818
ci-operator.openshift.io/cloud-cluster-profile: aws
1919
ci.openshift.io/generator: prowgen
2020
pj-rehearse.openshift.io/can-be-rehearsed: "true"
21-
name: pull-ci-openshift-priv-oauth-proxy-master-e2e-aws
21+
name: pull-ci-openshift-priv-oauth-proxy-main-e2e-aws
2222
path_alias: github.com/openshift/oauth-proxy
2323
rerun_command: /test e2e-aws
2424
spec:
@@ -85,8 +85,8 @@ presubmits:
8585
- agent: kubernetes
8686
always_run: true
8787
branches:
88-
- ^master$
89-
- ^master-
88+
- ^main$
89+
- ^main-
9090
cluster: build02
9191
context: ci/prow/e2e-component
9292
decorate: true
@@ -100,7 +100,7 @@ presubmits:
100100
ci-operator.openshift.io/cloud-cluster-profile: gcp
101101
ci.openshift.io/generator: prowgen
102102
pj-rehearse.openshift.io/can-be-rehearsed: "true"
103-
name: pull-ci-openshift-priv-oauth-proxy-master-e2e-component
103+
name: pull-ci-openshift-priv-oauth-proxy-main-e2e-component
104104
path_alias: github.com/openshift/oauth-proxy
105105
rerun_command: /test e2e-component
106106
spec:
@@ -167,9 +167,9 @@ presubmits:
167167
- agent: kubernetes
168168
always_run: true
169169
branches:
170-
- ^master$
171-
- ^master-
172-
cluster: build02
170+
- ^main$
171+
- ^main-
172+
cluster: build03
173173
context: ci/prow/images
174174
decorate: true
175175
decoration_config:
@@ -180,7 +180,7 @@ presubmits:
180180
labels:
181181
ci.openshift.io/generator: prowgen
182182
pj-rehearse.openshift.io/can-be-rehearsed: "true"
183-
name: pull-ci-openshift-priv-oauth-proxy-master-images
183+
name: pull-ci-openshift-priv-oauth-proxy-main-images
184184
path_alias: github.com/openshift/oauth-proxy
185185
rerun_command: /test images
186186
spec:
@@ -230,9 +230,9 @@ presubmits:
230230
- agent: kubernetes
231231
always_run: true
232232
branches:
233-
- ^master$
234-
- ^master-
235-
cluster: build02
233+
- ^main$
234+
- ^main-
235+
cluster: build03
236236
context: ci/prow/unit
237237
decorate: true
238238
decoration_config:
@@ -243,7 +243,7 @@ presubmits:
243243
labels:
244244
ci.openshift.io/generator: prowgen
245245
pj-rehearse.openshift.io/can-be-rehearsed: "true"
246-
name: pull-ci-openshift-priv-oauth-proxy-master-unit
246+
name: pull-ci-openshift-priv-oauth-proxy-main-unit
247247
path_alias: github.com/openshift/oauth-proxy
248248
rerun_command: /test unit
249249
spec:
@@ -293,9 +293,9 @@ presubmits:
293293
- agent: kubernetes
294294
always_run: true
295295
branches:
296-
- ^master$
297-
- ^master-
298-
cluster: build02
296+
- ^main$
297+
- ^main-
298+
cluster: build03
299299
context: ci/prow/verify
300300
decorate: true
301301
decoration_config:
@@ -306,7 +306,7 @@ presubmits:
306306
labels:
307307
ci.openshift.io/generator: prowgen
308308
pj-rehearse.openshift.io/can-be-rehearsed: "true"
309-
name: pull-ci-openshift-priv-oauth-proxy-master-verify
309+
name: pull-ci-openshift-priv-oauth-proxy-main-verify
310310
path_alias: github.com/openshift/oauth-proxy
311311
rerun_command: /test verify
312312
spec:
@@ -356,9 +356,9 @@ presubmits:
356356
- agent: kubernetes
357357
always_run: true
358358
branches:
359-
- ^master$
360-
- ^master-
361-
cluster: build02
359+
- ^main$
360+
- ^main-
361+
cluster: build03
362362
context: ci/prow/verify-deps
363363
decorate: true
364364
decoration_config:
@@ -369,7 +369,7 @@ presubmits:
369369
labels:
370370
ci.openshift.io/generator: prowgen
371371
pj-rehearse.openshift.io/can-be-rehearsed: "true"
372-
name: pull-ci-openshift-priv-oauth-proxy-master-verify-deps
372+
name: pull-ci-openshift-priv-oauth-proxy-main-verify-deps
373373
path_alias: github.com/openshift/oauth-proxy
374374
rerun_command: /test verify-deps
375375
spec:

ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-master-postsubmits.yaml ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-main-postsubmits.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ postsubmits:
33
- agent: kubernetes
44
always_run: true
55
branches:
6-
- ^master$
7-
cluster: build07
6+
- ^main$
7+
cluster: build03
88
decorate: true
99
labels:
1010
ci-operator.openshift.io/is-promotion: "true"
1111
ci.openshift.io/generator: prowgen
1212
max_concurrency: 1
13-
name: branch-ci-openshift-oauth-proxy-master-images
13+
name: branch-ci-openshift-oauth-proxy-main-images
1414
spec:
1515
containers:
1616
- args:
@@ -61,8 +61,8 @@ postsubmits:
6161
- agent: kubernetes
6262
always_run: true
6363
branches:
64-
- ^master$
65-
cluster: build07
64+
- ^main$
65+
cluster: build03
6666
decorate: true
6767
decoration_config:
6868
skip_cloning: true
@@ -71,7 +71,7 @@ postsubmits:
7171
ci-operator.openshift.io/variant: okd-scos
7272
ci.openshift.io/generator: prowgen
7373
max_concurrency: 1
74-
name: branch-ci-openshift-oauth-proxy-master-okd-scos-images
74+
name: branch-ci-openshift-oauth-proxy-main-okd-scos-images
7575
spec:
7676
containers:
7777
- args:

ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-master-presubmits.yaml ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-main-presubmits.yaml

+32-33
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ presubmits:
33
- agent: kubernetes
44
always_run: true
55
branches:
6-
- ^master$
7-
- ^master-
8-
cluster: build05
6+
- ^main$
7+
- ^main-
8+
cluster: build01
99
context: ci/prow/e2e-aws
1010
decorate: true
1111
labels:
1212
ci-operator.openshift.io/cloud: aws
1313
ci-operator.openshift.io/cloud-cluster-profile: aws
1414
ci.openshift.io/generator: prowgen
1515
pj-rehearse.openshift.io/can-be-rehearsed: "true"
16-
name: pull-ci-openshift-oauth-proxy-master-e2e-aws
16+
name: pull-ci-openshift-oauth-proxy-main-e2e-aws
1717
rerun_command: /test e2e-aws
1818
spec:
1919
containers:
@@ -75,8 +75,8 @@ presubmits:
7575
- agent: kubernetes
7676
always_run: true
7777
branches:
78-
- ^master$
79-
- ^master-
78+
- ^main$
79+
- ^main-
8080
cluster: build02
8181
context: ci/prow/e2e-component
8282
decorate: true
@@ -85,7 +85,7 @@ presubmits:
8585
ci-operator.openshift.io/cloud-cluster-profile: gcp
8686
ci.openshift.io/generator: prowgen
8787
pj-rehearse.openshift.io/can-be-rehearsed: "true"
88-
name: pull-ci-openshift-oauth-proxy-master-e2e-component
88+
name: pull-ci-openshift-oauth-proxy-main-e2e-component
8989
rerun_command: /test e2e-component
9090
spec:
9191
containers:
@@ -147,15 +147,15 @@ presubmits:
147147
- agent: kubernetes
148148
always_run: true
149149
branches:
150-
- ^master$
151-
- ^master-
152-
cluster: build11
150+
- ^main$
151+
- ^main-
152+
cluster: build03
153153
context: ci/prow/images
154154
decorate: true
155155
labels:
156156
ci.openshift.io/generator: prowgen
157157
pj-rehearse.openshift.io/can-be-rehearsed: "true"
158-
name: pull-ci-openshift-oauth-proxy-master-images
158+
name: pull-ci-openshift-oauth-proxy-main-images
159159
rerun_command: /test images
160160
spec:
161161
containers:
@@ -201,9 +201,9 @@ presubmits:
201201
- agent: kubernetes
202202
always_run: false
203203
branches:
204-
- ^master$
205-
- ^master-
206-
cluster: build05
204+
- ^main$
205+
- ^main-
206+
cluster: build01
207207
context: ci/prow/okd-scos-e2e-aws-ovn
208208
decorate: true
209209
decoration_config:
@@ -214,7 +214,7 @@ presubmits:
214214
ci-operator.openshift.io/variant: okd-scos
215215
ci.openshift.io/generator: prowgen
216216
pj-rehearse.openshift.io/can-be-rehearsed: "true"
217-
name: pull-ci-openshift-oauth-proxy-master-okd-scos-e2e-aws-ovn
217+
name: pull-ci-openshift-oauth-proxy-main-okd-scos-e2e-aws-ovn
218218
optional: true
219219
rerun_command: /test okd-scos-e2e-aws-ovn
220220
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -277,11 +277,11 @@ presubmits:
277277
secretName: result-aggregator
278278
trigger: (?m)^/test( | .* )okd-scos-e2e-aws-ovn,?($|\s.*)
279279
- agent: kubernetes
280-
always_run: false
280+
always_run: true
281281
branches:
282-
- ^master$
283-
- ^master-
284-
cluster: build11
282+
- ^main$
283+
- ^main-
284+
cluster: build03
285285
context: ci/prow/okd-scos-images
286286
decorate: true
287287
decoration_config:
@@ -290,8 +290,7 @@ presubmits:
290290
ci-operator.openshift.io/variant: okd-scos
291291
ci.openshift.io/generator: prowgen
292292
pj-rehearse.openshift.io/can-be-rehearsed: "true"
293-
name: pull-ci-openshift-oauth-proxy-master-okd-scos-images
294-
optional: true
293+
name: pull-ci-openshift-oauth-proxy-main-okd-scos-images
295294
rerun_command: /test okd-scos-images
296295
spec:
297296
containers:
@@ -338,15 +337,15 @@ presubmits:
338337
- agent: kubernetes
339338
always_run: true
340339
branches:
341-
- ^master$
342-
- ^master-
343-
cluster: build11
340+
- ^main$
341+
- ^main-
342+
cluster: build03
344343
context: ci/prow/unit
345344
decorate: true
346345
labels:
347346
ci.openshift.io/generator: prowgen
348347
pj-rehearse.openshift.io/can-be-rehearsed: "true"
349-
name: pull-ci-openshift-oauth-proxy-master-unit
348+
name: pull-ci-openshift-oauth-proxy-main-unit
350349
rerun_command: /test unit
351350
spec:
352351
containers:
@@ -391,15 +390,15 @@ presubmits:
391390
- agent: kubernetes
392391
always_run: true
393392
branches:
394-
- ^master$
395-
- ^master-
396-
cluster: build11
393+
- ^main$
394+
- ^main-
395+
cluster: build03
397396
context: ci/prow/verify
398397
decorate: true
399398
labels:
400399
ci.openshift.io/generator: prowgen
401400
pj-rehearse.openshift.io/can-be-rehearsed: "true"
402-
name: pull-ci-openshift-oauth-proxy-master-verify
401+
name: pull-ci-openshift-oauth-proxy-main-verify
403402
rerun_command: /test verify
404403
spec:
405404
containers:
@@ -444,15 +443,15 @@ presubmits:
444443
- agent: kubernetes
445444
always_run: true
446445
branches:
447-
- ^master$
448-
- ^master-
449-
cluster: build11
446+
- ^main$
447+
- ^main-
448+
cluster: build03
450449
context: ci/prow/verify-deps
451450
decorate: true
452451
labels:
453452
ci.openshift.io/generator: prowgen
454453
pj-rehearse.openshift.io/can-be-rehearsed: "true"
455-
name: pull-ci-openshift-oauth-proxy-master-verify-deps
454+
name: pull-ci-openshift-oauth-proxy-main-verify-deps
456455
rerun_command: /test verify-deps
457456
spec:
458457
containers:

0 commit comments

Comments
 (0)