Skip to content

Commit 93feaf6

Browse files
DennisPeriquetDennisPeriquet
committed
OCPBUGS-53005: run 'make jobs'
1 parent d0037fe commit 93feaf6

File tree

4 files changed

+134
-135
lines changed

4 files changed

+134
-135
lines changed

‎ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-postsubmits.yaml‎ renamed to ‎ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-postsubmits.yaml‎

Lines changed: 3 additions & 3 deletions
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: build04
6+
- ^main$
7+
cluster: build05
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-cluster-api-master-images
18+
name: branch-ci-openshift-priv-cluster-api-main-images
1919
path_alias: sigs.k8s.io/cluster-api
2020
spec:
2121
containers:

‎ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-presubmits.yaml‎ renamed to ‎ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-presubmits.yaml‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ presubmits:
33
- agent: kubernetes
44
always_run: false
55
branches:
6-
- ^master$
7-
- ^master-
8-
cluster: build03
6+
- ^main$
7+
- ^main-
8+
cluster: build11
99
context: ci/prow/e2e-aws-capi-techpreview
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-cluster-api-master-e2e-aws-capi-techpreview
21+
name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-capi-techpreview
2222
path_alias: sigs.k8s.io/cluster-api
2323
rerun_command: /test e2e-aws-capi-techpreview
2424
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -86,9 +86,9 @@ presubmits:
8686
- agent: kubernetes
8787
always_run: false
8888
branches:
89-
- ^master$
90-
- ^master-
91-
cluster: build03
89+
- ^main$
90+
- ^main-
91+
cluster: build11
9292
context: ci/prow/e2e-aws-ovn
9393
decorate: true
9494
decoration_config:
@@ -101,7 +101,7 @@ presubmits:
101101
ci-operator.openshift.io/cloud-cluster-profile: aws
102102
ci.openshift.io/generator: prowgen
103103
pj-rehearse.openshift.io/can-be-rehearsed: "true"
104-
name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-ovn
104+
name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-ovn
105105
path_alias: sigs.k8s.io/cluster-api
106106
rerun_command: /test e2e-aws-ovn
107107
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -169,9 +169,9 @@ presubmits:
169169
- agent: kubernetes
170170
always_run: false
171171
branches:
172-
- ^master$
173-
- ^master-
174-
cluster: build03
172+
- ^main$
173+
- ^main-
174+
cluster: build11
175175
context: ci/prow/e2e-aws-ovn-techpreview
176176
decorate: true
177177
decoration_config:
@@ -184,7 +184,7 @@ presubmits:
184184
ci-operator.openshift.io/cloud-cluster-profile: aws
185185
ci.openshift.io/generator: prowgen
186186
pj-rehearse.openshift.io/can-be-rehearsed: "true"
187-
name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-ovn-techpreview
187+
name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-ovn-techpreview
188188
path_alias: sigs.k8s.io/cluster-api
189189
rerun_command: /test e2e-aws-ovn-techpreview
190190
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -252,9 +252,9 @@ presubmits:
252252
- agent: kubernetes
253253
always_run: false
254254
branches:
255-
- ^master$
256-
- ^master-
257-
cluster: build03
255+
- ^main$
256+
- ^main-
257+
cluster: build11
258258
context: ci/prow/e2e-aws-serial-1of2
259259
decorate: true
260260
decoration_config:
@@ -267,7 +267,7 @@ presubmits:
267267
ci-operator.openshift.io/cloud-cluster-profile: aws-3
268268
ci.openshift.io/generator: prowgen
269269
pj-rehearse.openshift.io/can-be-rehearsed: "true"
270-
name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-serial-1of2
270+
name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-serial-1of2
271271
path_alias: sigs.k8s.io/cluster-api
272272
rerun_command: /test e2e-aws-serial-1of2
273273
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -336,9 +336,9 @@ presubmits:
336336
- agent: kubernetes
337337
always_run: false
338338
branches:
339-
- ^master$
340-
- ^master-
341-
cluster: build03
339+
- ^main$
340+
- ^main-
341+
cluster: build11
342342
context: ci/prow/e2e-aws-serial-2of2
343343
decorate: true
344344
decoration_config:
@@ -351,7 +351,7 @@ presubmits:
351351
ci-operator.openshift.io/cloud-cluster-profile: aws-3
352352
ci.openshift.io/generator: prowgen
353353
pj-rehearse.openshift.io/can-be-rehearsed: "true"
354-
name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-serial-2of2
354+
name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-serial-2of2
355355
path_alias: sigs.k8s.io/cluster-api
356356
rerun_command: /test e2e-aws-serial-2of2
357357
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -420,9 +420,9 @@ presubmits:
420420
- agent: kubernetes
421421
always_run: false
422422
branches:
423-
- ^master$
424-
- ^master-
425-
cluster: build03
423+
- ^main$
424+
- ^main-
425+
cluster: build05
426426
context: ci/prow/e2e-azure-capi-techpreview
427427
decorate: true
428428
decoration_config:
@@ -435,7 +435,7 @@ presubmits:
435435
ci-operator.openshift.io/cloud-cluster-profile: azure4
436436
ci.openshift.io/generator: prowgen
437437
pj-rehearse.openshift.io/can-be-rehearsed: "true"
438-
name: pull-ci-openshift-priv-cluster-api-master-e2e-azure-capi-techpreview
438+
name: pull-ci-openshift-priv-cluster-api-main-e2e-azure-capi-techpreview
439439
path_alias: sigs.k8s.io/cluster-api
440440
rerun_command: /test e2e-azure-capi-techpreview
441441
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -503,8 +503,8 @@ presubmits:
503503
- agent: kubernetes
504504
always_run: false
505505
branches:
506-
- ^master$
507-
- ^master-
506+
- ^main$
507+
- ^main-
508508
cluster: build04
509509
context: ci/prow/e2e-gcp-capi-techpreview
510510
decorate: true
@@ -518,7 +518,7 @@ presubmits:
518518
ci-operator.openshift.io/cloud-cluster-profile: gcp
519519
ci.openshift.io/generator: prowgen
520520
pj-rehearse.openshift.io/can-be-rehearsed: "true"
521-
name: pull-ci-openshift-priv-cluster-api-master-e2e-gcp-capi-techpreview
521+
name: pull-ci-openshift-priv-cluster-api-main-e2e-gcp-capi-techpreview
522522
path_alias: sigs.k8s.io/cluster-api
523523
rerun_command: /test e2e-gcp-capi-techpreview
524524
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -586,9 +586,9 @@ presubmits:
586586
- agent: kubernetes
587587
always_run: false
588588
branches:
589-
- ^master$
590-
- ^master-
591-
cluster: build03
589+
- ^main$
590+
- ^main-
591+
cluster: build05
592592
context: ci/prow/e2e-hypershift
593593
decorate: true
594594
decoration_config:
@@ -601,7 +601,7 @@ presubmits:
601601
ci-operator.openshift.io/cloud-cluster-profile: hypershift
602602
ci.openshift.io/generator: prowgen
603603
pj-rehearse.openshift.io/can-be-rehearsed: "true"
604-
name: pull-ci-openshift-priv-cluster-api-master-e2e-hypershift
604+
name: pull-ci-openshift-priv-cluster-api-main-e2e-hypershift
605605
path_alias: sigs.k8s.io/cluster-api
606606
rerun_command: /test e2e-hypershift
607607
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -669,9 +669,9 @@ presubmits:
669669
- agent: kubernetes
670670
always_run: false
671671
branches:
672-
- ^master$
673-
- ^master-
674-
cluster: build03
672+
- ^main$
673+
- ^main-
674+
cluster: build11
675675
context: ci/prow/e2e-openstack-capi-techpreview
676676
decorate: true
677677
decoration_config:
@@ -684,7 +684,7 @@ presubmits:
684684
ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
685685
ci.openshift.io/generator: prowgen
686686
pj-rehearse.openshift.io/can-be-rehearsed: "true"
687-
name: pull-ci-openshift-priv-cluster-api-master-e2e-openstack-capi-techpreview
687+
name: pull-ci-openshift-priv-cluster-api-main-e2e-openstack-capi-techpreview
688688
path_alias: sigs.k8s.io/cluster-api
689689
rerun_command: /test e2e-openstack-capi-techpreview
690690
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -752,8 +752,8 @@ presubmits:
752752
- agent: kubernetes
753753
always_run: false
754754
branches:
755-
- ^master$
756-
- ^master-
755+
- ^main$
756+
- ^main-
757757
cluster: vsphere02
758758
context: ci/prow/e2e-vsphere-capi-techpreview
759759
decorate: true
@@ -767,7 +767,7 @@ presubmits:
767767
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
768768
ci.openshift.io/generator: prowgen
769769
pj-rehearse.openshift.io/can-be-rehearsed: "true"
770-
name: pull-ci-openshift-priv-cluster-api-master-e2e-vsphere-capi-techpreview
770+
name: pull-ci-openshift-priv-cluster-api-main-e2e-vsphere-capi-techpreview
771771
path_alias: sigs.k8s.io/cluster-api
772772
rerun_command: /test e2e-vsphere-capi-techpreview
773773
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -835,9 +835,9 @@ presubmits:
835835
- agent: kubernetes
836836
always_run: true
837837
branches:
838-
- ^master$
839-
- ^master-
840-
cluster: build03
838+
- ^main$
839+
- ^main-
840+
cluster: build05
841841
context: ci/prow/images
842842
decorate: true
843843
decoration_config:
@@ -848,7 +848,7 @@ presubmits:
848848
labels:
849849
ci.openshift.io/generator: prowgen
850850
pj-rehearse.openshift.io/can-be-rehearsed: "true"
851-
name: pull-ci-openshift-priv-cluster-api-master-images
851+
name: pull-ci-openshift-priv-cluster-api-main-images
852852
path_alias: sigs.k8s.io/cluster-api
853853
rerun_command: /test images
854854
spec:
@@ -898,9 +898,9 @@ presubmits:
898898
- agent: kubernetes
899899
always_run: true
900900
branches:
901-
- ^master$
902-
- ^master-
903-
cluster: build03
901+
- ^main$
902+
- ^main-
903+
cluster: build11
904904
context: ci/prow/regression-clusterinfra-aws-ipi-techpreview
905905
decorate: true
906906
decoration_config:
@@ -914,7 +914,7 @@ presubmits:
914914
ci-operator.openshift.io/cloud-cluster-profile: aws
915915
ci.openshift.io/generator: prowgen
916916
pj-rehearse.openshift.io/can-be-rehearsed: "true"
917-
name: pull-ci-openshift-priv-cluster-api-master-regression-clusterinfra-aws-ipi-techpreview
917+
name: pull-ci-openshift-priv-cluster-api-main-regression-clusterinfra-aws-ipi-techpreview
918918
optional: true
919919
path_alias: sigs.k8s.io/cluster-api
920920
rerun_command: /test regression-clusterinfra-aws-ipi-techpreview
@@ -982,9 +982,9 @@ presubmits:
982982
- agent: kubernetes
983983
always_run: true
984984
branches:
985-
- ^master$
986-
- ^master-
987-
cluster: build03
985+
- ^main$
986+
- ^main-
987+
cluster: build05
988988
context: ci/prow/unit
989989
decorate: true
990990
decoration_config:
@@ -995,7 +995,7 @@ presubmits:
995995
labels:
996996
ci.openshift.io/generator: prowgen
997997
pj-rehearse.openshift.io/can-be-rehearsed: "true"
998-
name: pull-ci-openshift-priv-cluster-api-master-unit
998+
name: pull-ci-openshift-priv-cluster-api-main-unit
999999
path_alias: sigs.k8s.io/cluster-api
10001000
rerun_command: /test unit
10011001
spec:
@@ -1045,9 +1045,9 @@ presubmits:
10451045
- agent: kubernetes
10461046
always_run: true
10471047
branches:
1048-
- ^master$
1049-
- ^master-
1050-
cluster: build03
1048+
- ^main$
1049+
- ^main-
1050+
cluster: build05
10511051
context: ci/prow/verify-commits
10521052
decorate: true
10531053
decoration_config:
@@ -1058,7 +1058,7 @@ presubmits:
10581058
labels:
10591059
ci.openshift.io/generator: prowgen
10601060
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1061-
name: pull-ci-openshift-priv-cluster-api-master-verify-commits
1061+
name: pull-ci-openshift-priv-cluster-api-main-verify-commits
10621062
optional: true
10631063
path_alias: sigs.k8s.io/cluster-api
10641064
rerun_command: /test verify-commits
@@ -1109,9 +1109,9 @@ presubmits:
11091109
- agent: kubernetes
11101110
always_run: true
11111111
branches:
1112-
- ^master$
1113-
- ^master-
1114-
cluster: build03
1112+
- ^main$
1113+
- ^main-
1114+
cluster: build05
11151115
context: ci/prow/verify-deps
11161116
decorate: true
11171117
decoration_config:
@@ -1122,7 +1122,7 @@ presubmits:
11221122
labels:
11231123
ci.openshift.io/generator: prowgen
11241124
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1125-
name: pull-ci-openshift-priv-cluster-api-master-verify-deps
1125+
name: pull-ci-openshift-priv-cluster-api-main-verify-deps
11261126
path_alias: sigs.k8s.io/cluster-api
11271127
rerun_command: /test verify-deps
11281128
spec:

‎ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-postsubmits.yaml‎ renamed to ‎ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-postsubmits.yaml‎

Lines changed: 6 additions & 6 deletions
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: build11
6+
- ^main$
7+
cluster: build05
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-cluster-api-master-images
13+
name: branch-ci-openshift-cluster-api-main-images
1414
path_alias: sigs.k8s.io/cluster-api
1515
spec:
1616
containers:
@@ -62,8 +62,8 @@ postsubmits:
6262
- agent: kubernetes
6363
always_run: true
6464
branches:
65-
- ^master$
66-
cluster: build11
65+
- ^main$
66+
cluster: build05
6767
decorate: true
6868
decoration_config:
6969
skip_cloning: true
@@ -72,7 +72,7 @@ postsubmits:
7272
ci-operator.openshift.io/variant: okd-scos
7373
ci.openshift.io/generator: prowgen
7474
max_concurrency: 1
75-
name: branch-ci-openshift-cluster-api-master-okd-scos-images
75+
name: branch-ci-openshift-cluster-api-main-okd-scos-images
7676
spec:
7777
containers:
7878
- args:

0 commit comments

Comments
 (0)