Skip to content

Commit 7b7219a

Browse files
DennisPeriquetDennisPeriquet
committed
OCPBUGS-53005: run 'make jobs'
1 parent edea4bf commit 7b7219a

File tree

4 files changed

+126
-127
lines changed

4 files changed

+126
-127
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: build03
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: 54 additions & 54 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
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
270+
name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-serial
271271
path_alias: sigs.k8s.io/cluster-api
272272
rerun_command: /test e2e-aws-serial
273273
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -335,9 +335,9 @@ presubmits:
335335
- agent: kubernetes
336336
always_run: false
337337
branches:
338-
- ^master$
339-
- ^master-
340-
cluster: build03
338+
- ^main$
339+
- ^main-
340+
cluster: build05
341341
context: ci/prow/e2e-azure-capi-techpreview
342342
decorate: true
343343
decoration_config:
@@ -350,7 +350,7 @@ presubmits:
350350
ci-operator.openshift.io/cloud-cluster-profile: azure4
351351
ci.openshift.io/generator: prowgen
352352
pj-rehearse.openshift.io/can-be-rehearsed: "true"
353-
name: pull-ci-openshift-priv-cluster-api-master-e2e-azure-capi-techpreview
353+
name: pull-ci-openshift-priv-cluster-api-main-e2e-azure-capi-techpreview
354354
path_alias: sigs.k8s.io/cluster-api
355355
rerun_command: /test e2e-azure-capi-techpreview
356356
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -418,8 +418,8 @@ presubmits:
418418
- agent: kubernetes
419419
always_run: false
420420
branches:
421-
- ^master$
422-
- ^master-
421+
- ^main$
422+
- ^main-
423423
cluster: build02
424424
context: ci/prow/e2e-gcp-capi-techpreview
425425
decorate: true
@@ -433,7 +433,7 @@ presubmits:
433433
ci-operator.openshift.io/cloud-cluster-profile: gcp
434434
ci.openshift.io/generator: prowgen
435435
pj-rehearse.openshift.io/can-be-rehearsed: "true"
436-
name: pull-ci-openshift-priv-cluster-api-master-e2e-gcp-capi-techpreview
436+
name: pull-ci-openshift-priv-cluster-api-main-e2e-gcp-capi-techpreview
437437
path_alias: sigs.k8s.io/cluster-api
438438
rerun_command: /test e2e-gcp-capi-techpreview
439439
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -501,9 +501,9 @@ presubmits:
501501
- agent: kubernetes
502502
always_run: false
503503
branches:
504-
- ^master$
505-
- ^master-
506-
cluster: build03
504+
- ^main$
505+
- ^main-
506+
cluster: build05
507507
context: ci/prow/e2e-hypershift
508508
decorate: true
509509
decoration_config:
@@ -516,7 +516,7 @@ presubmits:
516516
ci-operator.openshift.io/cloud-cluster-profile: hypershift
517517
ci.openshift.io/generator: prowgen
518518
pj-rehearse.openshift.io/can-be-rehearsed: "true"
519-
name: pull-ci-openshift-priv-cluster-api-master-e2e-hypershift
519+
name: pull-ci-openshift-priv-cluster-api-main-e2e-hypershift
520520
path_alias: sigs.k8s.io/cluster-api
521521
rerun_command: /test e2e-hypershift
522522
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -584,9 +584,9 @@ presubmits:
584584
- agent: kubernetes
585585
always_run: false
586586
branches:
587-
- ^master$
588-
- ^master-
589-
cluster: build03
587+
- ^main$
588+
- ^main-
589+
cluster: build11
590590
context: ci/prow/e2e-openstack-capi-techpreview
591591
decorate: true
592592
decoration_config:
@@ -599,7 +599,7 @@ presubmits:
599599
ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
600600
ci.openshift.io/generator: prowgen
601601
pj-rehearse.openshift.io/can-be-rehearsed: "true"
602-
name: pull-ci-openshift-priv-cluster-api-master-e2e-openstack-capi-techpreview
602+
name: pull-ci-openshift-priv-cluster-api-main-e2e-openstack-capi-techpreview
603603
path_alias: sigs.k8s.io/cluster-api
604604
rerun_command: /test e2e-openstack-capi-techpreview
605605
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -667,8 +667,8 @@ presubmits:
667667
- agent: kubernetes
668668
always_run: false
669669
branches:
670-
- ^master$
671-
- ^master-
670+
- ^main$
671+
- ^main-
672672
cluster: vsphere02
673673
context: ci/prow/e2e-vsphere-capi-techpreview
674674
decorate: true
@@ -682,7 +682,7 @@ presubmits:
682682
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
683683
ci.openshift.io/generator: prowgen
684684
pj-rehearse.openshift.io/can-be-rehearsed: "true"
685-
name: pull-ci-openshift-priv-cluster-api-master-e2e-vsphere-capi-techpreview
685+
name: pull-ci-openshift-priv-cluster-api-main-e2e-vsphere-capi-techpreview
686686
path_alias: sigs.k8s.io/cluster-api
687687
rerun_command: /test e2e-vsphere-capi-techpreview
688688
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
@@ -750,9 +750,9 @@ presubmits:
750750
- agent: kubernetes
751751
always_run: true
752752
branches:
753-
- ^master$
754-
- ^master-
755-
cluster: build03
753+
- ^main$
754+
- ^main-
755+
cluster: build05
756756
context: ci/prow/images
757757
decorate: true
758758
decoration_config:
@@ -763,7 +763,7 @@ presubmits:
763763
labels:
764764
ci.openshift.io/generator: prowgen
765765
pj-rehearse.openshift.io/can-be-rehearsed: "true"
766-
name: pull-ci-openshift-priv-cluster-api-master-images
766+
name: pull-ci-openshift-priv-cluster-api-main-images
767767
path_alias: sigs.k8s.io/cluster-api
768768
rerun_command: /test images
769769
spec:
@@ -813,9 +813,9 @@ presubmits:
813813
- agent: kubernetes
814814
always_run: true
815815
branches:
816-
- ^master$
817-
- ^master-
818-
cluster: build03
816+
- ^main$
817+
- ^main-
818+
cluster: build11
819819
context: ci/prow/regression-clusterinfra-aws-ipi-techpreview
820820
decorate: true
821821
decoration_config:
@@ -829,7 +829,7 @@ presubmits:
829829
ci-operator.openshift.io/cloud-cluster-profile: aws
830830
ci.openshift.io/generator: prowgen
831831
pj-rehearse.openshift.io/can-be-rehearsed: "true"
832-
name: pull-ci-openshift-priv-cluster-api-master-regression-clusterinfra-aws-ipi-techpreview
832+
name: pull-ci-openshift-priv-cluster-api-main-regression-clusterinfra-aws-ipi-techpreview
833833
optional: true
834834
path_alias: sigs.k8s.io/cluster-api
835835
rerun_command: /test regression-clusterinfra-aws-ipi-techpreview
@@ -897,9 +897,9 @@ presubmits:
897897
- agent: kubernetes
898898
always_run: true
899899
branches:
900-
- ^master$
901-
- ^master-
902-
cluster: build03
900+
- ^main$
901+
- ^main-
902+
cluster: build05
903903
context: ci/prow/unit
904904
decorate: true
905905
decoration_config:
@@ -910,7 +910,7 @@ presubmits:
910910
labels:
911911
ci.openshift.io/generator: prowgen
912912
pj-rehearse.openshift.io/can-be-rehearsed: "true"
913-
name: pull-ci-openshift-priv-cluster-api-master-unit
913+
name: pull-ci-openshift-priv-cluster-api-main-unit
914914
path_alias: sigs.k8s.io/cluster-api
915915
rerun_command: /test unit
916916
spec:
@@ -960,9 +960,9 @@ presubmits:
960960
- agent: kubernetes
961961
always_run: true
962962
branches:
963-
- ^master$
964-
- ^master-
965-
cluster: build03
963+
- ^main$
964+
- ^main-
965+
cluster: build05
966966
context: ci/prow/verify-commits
967967
decorate: true
968968
decoration_config:
@@ -973,7 +973,7 @@ presubmits:
973973
labels:
974974
ci.openshift.io/generator: prowgen
975975
pj-rehearse.openshift.io/can-be-rehearsed: "true"
976-
name: pull-ci-openshift-priv-cluster-api-master-verify-commits
976+
name: pull-ci-openshift-priv-cluster-api-main-verify-commits
977977
optional: true
978978
path_alias: sigs.k8s.io/cluster-api
979979
rerun_command: /test verify-commits
@@ -1024,9 +1024,9 @@ presubmits:
10241024
- agent: kubernetes
10251025
always_run: true
10261026
branches:
1027-
- ^master$
1028-
- ^master-
1029-
cluster: build03
1027+
- ^main$
1028+
- ^main-
1029+
cluster: build05
10301030
context: ci/prow/verify-deps
10311031
decorate: true
10321032
decoration_config:
@@ -1037,7 +1037,7 @@ presubmits:
10371037
labels:
10381038
ci.openshift.io/generator: prowgen
10391039
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1040-
name: pull-ci-openshift-priv-cluster-api-master-verify-deps
1040+
name: pull-ci-openshift-priv-cluster-api-main-verify-deps
10411041
path_alias: sigs.k8s.io/cluster-api
10421042
rerun_command: /test verify-deps
10431043
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: build06
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: build06
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)