Skip to content

Commit c870621

Browse files
OCPBUGS-48103: rename 'master' to 'main' for vmware-vsphere-csi-driver-operator (openshift#60446)
* OCPBUGS-48103: rename 'master' to 'main' for vmware-vsphere-csi-driver-operator * OCPBUGS-48103: run 'make jobs'
1 parent 034ad79 commit c870621

7 files changed

+82
-83
lines changed
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,6 @@ tests:
111111
cluster_profile: vsphere-elastic
112112
workflow: openshift-e2e-vsphere-zones
113113
zz_generated_metadata:
114-
branch: master
114+
branch: main
115115
org: openshift-priv
116116
repo: vmware-vsphere-csi-driver-operator
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,6 @@ tests:
110110
cluster_profile: vsphere-elastic
111111
workflow: openshift-e2e-vsphere-zones
112112
zz_generated_metadata:
113-
branch: master
113+
branch: main
114114
org: openshift
115115
repo: vmware-vsphere-csi-driver-operator
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ tests:
4848
cluster_profile: aws
4949
workflow: openshift-e2e-aws
5050
zz_generated_metadata:
51-
branch: master
51+
branch: main
5252
org: openshift
5353
repo: vmware-vsphere-csi-driver-operator
5454
variant: okd-scos
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ postsubmits:
33
- agent: kubernetes
44
always_run: true
55
branches:
6-
- ^master$
6+
- ^main$
77
cluster: vsphere02
88
decorate: true
99
decoration_config:
@@ -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-vmware-vsphere-csi-driver-operator-master-images
18+
name: branch-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-images
1919
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
2020
spec:
2121
containers:
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ presubmits:
33
- agent: kubernetes
44
always_run: true
55
branches:
6-
- ^master$
7-
- ^master-
6+
- ^main$
7+
- ^main-
88
cluster: vsphere02
99
context: ci/prow/e2e-vsphere
1010
decorate: true
@@ -18,7 +18,7 @@ presubmits:
1818
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
1919
ci.openshift.io/generator: prowgen
2020
pj-rehearse.openshift.io/can-be-rehearsed: "true"
21-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-e2e-vsphere
21+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-e2e-vsphere
2222
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
2323
rerun_command: /test e2e-vsphere
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: vsphere02
9191
context: ci/prow/e2e-vsphere-csi
9292
decorate: true
@@ -100,7 +100,7 @@ presubmits:
100100
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
101101
ci.openshift.io/generator: prowgen
102102
pj-rehearse.openshift.io/can-be-rehearsed: "true"
103-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-e2e-vsphere-csi
103+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-csi
104104
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
105105
rerun_command: /test e2e-vsphere-csi
106106
spec:
@@ -167,8 +167,8 @@ presubmits:
167167
- agent: kubernetes
168168
always_run: true
169169
branches:
170-
- ^master$
171-
- ^master-
170+
- ^main$
171+
- ^main-
172172
cluster: vsphere02
173173
context: ci/prow/e2e-vsphere-csi-extended
174174
decorate: true
@@ -182,7 +182,7 @@ presubmits:
182182
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
183183
ci.openshift.io/generator: prowgen
184184
pj-rehearse.openshift.io/can-be-rehearsed: "true"
185-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-e2e-vsphere-csi-extended
185+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-csi-extended
186186
optional: true
187187
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
188188
rerun_command: /test e2e-vsphere-csi-extended
@@ -250,8 +250,8 @@ presubmits:
250250
- agent: kubernetes
251251
always_run: true
252252
branches:
253-
- ^master$
254-
- ^master-
253+
- ^main$
254+
- ^main-
255255
cluster: vsphere02
256256
context: ci/prow/e2e-vsphere-operator-test
257257
decorate: true
@@ -265,7 +265,7 @@ presubmits:
265265
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
266266
ci.openshift.io/generator: prowgen
267267
pj-rehearse.openshift.io/can-be-rehearsed: "true"
268-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-e2e-vsphere-operator-test
268+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-operator-test
269269
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
270270
rerun_command: /test e2e-vsphere-operator-test
271271
spec:
@@ -332,8 +332,8 @@ presubmits:
332332
- agent: kubernetes
333333
always_run: true
334334
branches:
335-
- ^master$
336-
- ^master-
335+
- ^main$
336+
- ^main-
337337
cluster: vsphere02
338338
context: ci/prow/e2e-vsphere-ovn-upgrade
339339
decorate: true
@@ -347,7 +347,7 @@ presubmits:
347347
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
348348
ci.openshift.io/generator: prowgen
349349
pj-rehearse.openshift.io/can-be-rehearsed: "true"
350-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-e2e-vsphere-ovn-upgrade
350+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-ovn-upgrade
351351
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
352352
rerun_command: /test e2e-vsphere-ovn-upgrade
353353
spec:
@@ -414,8 +414,8 @@ presubmits:
414414
- agent: kubernetes
415415
always_run: true
416416
branches:
417-
- ^master$
418-
- ^master-
417+
- ^main$
418+
- ^main-
419419
cluster: vsphere02
420420
context: ci/prow/e2e-vsphere-zones
421421
decorate: true
@@ -429,7 +429,7 @@ presubmits:
429429
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
430430
ci.openshift.io/generator: prowgen
431431
pj-rehearse.openshift.io/can-be-rehearsed: "true"
432-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-e2e-vsphere-zones
432+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-zones
433433
optional: true
434434
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
435435
rerun_command: /test e2e-vsphere-zones
@@ -497,8 +497,8 @@ presubmits:
497497
- agent: kubernetes
498498
always_run: true
499499
branches:
500-
- ^master$
501-
- ^master-
500+
- ^main$
501+
- ^main-
502502
cluster: vsphere02
503503
context: ci/prow/images
504504
decorate: true
@@ -510,7 +510,7 @@ presubmits:
510510
labels:
511511
ci.openshift.io/generator: prowgen
512512
pj-rehearse.openshift.io/can-be-rehearsed: "true"
513-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-images
513+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-images
514514
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
515515
rerun_command: /test images
516516
spec:
@@ -560,8 +560,8 @@ presubmits:
560560
- agent: kubernetes
561561
always_run: true
562562
branches:
563-
- ^master$
564-
- ^master-
563+
- ^main$
564+
- ^main-
565565
cluster: vsphere02
566566
context: ci/prow/security
567567
decorate: true
@@ -573,7 +573,7 @@ presubmits:
573573
labels:
574574
ci.openshift.io/generator: prowgen
575575
pj-rehearse.openshift.io/can-be-rehearsed: "true"
576-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-security
576+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-security
577577
optional: true
578578
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
579579
rerun_command: /test security
@@ -631,8 +631,8 @@ presubmits:
631631
- agent: kubernetes
632632
always_run: true
633633
branches:
634-
- ^master$
635-
- ^master-
634+
- ^main$
635+
- ^main-
636636
cluster: vsphere02
637637
context: ci/prow/unit
638638
decorate: true
@@ -644,7 +644,7 @@ presubmits:
644644
labels:
645645
ci.openshift.io/generator: prowgen
646646
pj-rehearse.openshift.io/can-be-rehearsed: "true"
647-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-unit
647+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-unit
648648
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
649649
rerun_command: /test unit
650650
spec:
@@ -694,8 +694,8 @@ presubmits:
694694
- agent: kubernetes
695695
always_run: true
696696
branches:
697-
- ^master$
698-
- ^master-
697+
- ^main$
698+
- ^main-
699699
cluster: vsphere02
700700
context: ci/prow/verify
701701
decorate: true
@@ -707,7 +707,7 @@ presubmits:
707707
labels:
708708
ci.openshift.io/generator: prowgen
709709
pj-rehearse.openshift.io/can-be-rehearsed: "true"
710-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-verify
710+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-verify
711711
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
712712
rerun_command: /test verify
713713
spec:
@@ -757,8 +757,8 @@ presubmits:
757757
- agent: kubernetes
758758
always_run: true
759759
branches:
760-
- ^master$
761-
- ^master-
760+
- ^main$
761+
- ^main-
762762
cluster: vsphere02
763763
context: ci/prow/verify-deps
764764
decorate: true
@@ -770,7 +770,7 @@ presubmits:
770770
labels:
771771
ci.openshift.io/generator: prowgen
772772
pj-rehearse.openshift.io/can-be-rehearsed: "true"
773-
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-master-verify-deps
773+
name: pull-ci-openshift-priv-vmware-vsphere-csi-driver-operator-main-verify-deps
774774
path_alias: github.com/openshift/vmware-vsphere-csi-driver-operator
775775
rerun_command: /test verify-deps
776776
spec:
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ postsubmits:
33
- agent: kubernetes
44
always_run: true
55
branches:
6-
- ^master$
6+
- ^main$
77
cluster: vsphere02
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-vmware-vsphere-csi-driver-operator-master-images
13+
name: branch-ci-openshift-vmware-vsphere-csi-driver-operator-main-images
1414
spec:
1515
containers:
1616
- args:
@@ -61,7 +61,7 @@ postsubmits:
6161
- agent: kubernetes
6262
always_run: true
6363
branches:
64-
- ^master$
64+
- ^main$
6565
cluster: vsphere02
6666
decorate: true
6767
decoration_config:
@@ -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-vmware-vsphere-csi-driver-operator-master-okd-scos-images
74+
name: branch-ci-openshift-vmware-vsphere-csi-driver-operator-main-okd-scos-images
7575
spec:
7676
containers:
7777
- args:

0 commit comments

Comments
 (0)