Skip to content

Commit 356a132

Browse files
OCPBUGS-49317: rename 'master' to 'main' for linuxptp-daemon (openshift#60976)
* OCPBUGS-49317: rename 'master' to 'main' for linuxptp-daemon * OCPBUGS-49317: run 'make jobs'
1 parent 3d18501 commit 356a132

File tree

6 files changed

+48
-48
lines changed

6 files changed

+48
-48
lines changed

ci-operator/config/openshift-priv/linuxptp-daemon/openshift-priv-linuxptp-daemon-master.yaml renamed to ci-operator/config/openshift-priv/linuxptp-daemon/openshift-priv-linuxptp-daemon-main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ tests:
6464
SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high --policy-path=.snyk
6565
workflow: openshift-ci-security
6666
zz_generated_metadata:
67-
branch: master
67+
branch: main
6868
org: openshift-priv
6969
repo: linuxptp-daemon

ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml renamed to ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ tests:
6262
SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high --policy-path=.snyk
6363
workflow: openshift-ci-security
6464
zz_generated_metadata:
65-
branch: master
65+
branch: main
6666
org: openshift
6767
repo: linuxptp-daemon
+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: build10
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-linuxptp-daemon-master-images
18+
name: branch-ci-openshift-priv-linuxptp-daemon-main-images
1919
path_alias: github.com/openshift/linuxptp-daemon
2020
spec:
2121
containers:
+20-20
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: build10
6+
- ^main$
7+
- ^main-
8+
cluster: build06
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-linuxptp-daemon-master-e2e-aws
21+
name: pull-ci-openshift-priv-linuxptp-daemon-main-e2e-aws
2222
path_alias: github.com/openshift/linuxptp-daemon
2323
rerun_command: /test e2e-aws
2424
spec:
@@ -85,9 +85,9 @@ presubmits:
8585
- agent: kubernetes
8686
always_run: true
8787
branches:
88-
- ^master$
89-
- ^master-
90-
cluster: build10
88+
- ^main$
89+
- ^main-
90+
cluster: build03
9191
context: ci/prow/gofmt
9292
decorate: true
9393
decoration_config:
@@ -98,7 +98,7 @@ presubmits:
9898
labels:
9999
ci.openshift.io/generator: prowgen
100100
pj-rehearse.openshift.io/can-be-rehearsed: "true"
101-
name: pull-ci-openshift-priv-linuxptp-daemon-master-gofmt
101+
name: pull-ci-openshift-priv-linuxptp-daemon-main-gofmt
102102
path_alias: github.com/openshift/linuxptp-daemon
103103
rerun_command: /test gofmt
104104
spec:
@@ -148,9 +148,9 @@ presubmits:
148148
- agent: kubernetes
149149
always_run: true
150150
branches:
151-
- ^master$
152-
- ^master-
153-
cluster: build10
151+
- ^main$
152+
- ^main-
153+
cluster: build03
154154
context: ci/prow/images
155155
decorate: true
156156
decoration_config:
@@ -161,7 +161,7 @@ presubmits:
161161
labels:
162162
ci.openshift.io/generator: prowgen
163163
pj-rehearse.openshift.io/can-be-rehearsed: "true"
164-
name: pull-ci-openshift-priv-linuxptp-daemon-master-images
164+
name: pull-ci-openshift-priv-linuxptp-daemon-main-images
165165
path_alias: github.com/openshift/linuxptp-daemon
166166
rerun_command: /test images
167167
spec:
@@ -211,9 +211,9 @@ presubmits:
211211
- agent: kubernetes
212212
always_run: false
213213
branches:
214-
- ^master$
215-
- ^master-
216-
cluster: build10
214+
- ^main$
215+
- ^main-
216+
cluster: build03
217217
context: ci/prow/security
218218
decorate: true
219219
decoration_config:
@@ -224,7 +224,7 @@ presubmits:
224224
labels:
225225
ci.openshift.io/generator: prowgen
226226
pj-rehearse.openshift.io/can-be-rehearsed: "true"
227-
name: pull-ci-openshift-priv-linuxptp-daemon-master-security
227+
name: pull-ci-openshift-priv-linuxptp-daemon-main-security
228228
optional: true
229229
path_alias: github.com/openshift/linuxptp-daemon
230230
rerun_command: /test security
@@ -283,9 +283,9 @@ presubmits:
283283
- agent: kubernetes
284284
always_run: true
285285
branches:
286-
- ^master$
287-
- ^master-
288-
cluster: build10
286+
- ^main$
287+
- ^main-
288+
cluster: build03
289289
context: ci/prow/unit-test
290290
decorate: true
291291
decoration_config:
@@ -296,7 +296,7 @@ presubmits:
296296
labels:
297297
ci.openshift.io/generator: prowgen
298298
pj-rehearse.openshift.io/can-be-rehearsed: "true"
299-
name: pull-ci-openshift-priv-linuxptp-daemon-master-unit-test
299+
name: pull-ci-openshift-priv-linuxptp-daemon-main-unit-test
300300
path_alias: github.com/openshift/linuxptp-daemon
301301
rerun_command: /test unit-test
302302
spec:

ci-operator/jobs/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master-postsubmits.yaml renamed to ci-operator/jobs/openshift/linuxptp-daemon/openshift-linuxptp-daemon-main-postsubmits.yaml

+3-3
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: build05
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-linuxptp-daemon-master-images
13+
name: branch-ci-openshift-linuxptp-daemon-main-images
1414
spec:
1515
containers:
1616
- args:

ci-operator/jobs/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master-presubmits.yaml renamed to ci-operator/jobs/openshift/linuxptp-daemon/openshift-linuxptp-daemon-main-presubmits.yaml

+20-20
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: build01
6+
- ^main$
7+
- ^main-
8+
cluster: build09
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-linuxptp-daemon-master-e2e-aws
16+
name: pull-ci-openshift-linuxptp-daemon-main-e2e-aws
1717
rerun_command: /test e2e-aws
1818
spec:
1919
containers:
@@ -75,15 +75,15 @@ presubmits:
7575
- agent: kubernetes
7676
always_run: true
7777
branches:
78-
- ^master$
79-
- ^master-
80-
cluster: build10
78+
- ^main$
79+
- ^main-
80+
cluster: build03
8181
context: ci/prow/gofmt
8282
decorate: true
8383
labels:
8484
ci.openshift.io/generator: prowgen
8585
pj-rehearse.openshift.io/can-be-rehearsed: "true"
86-
name: pull-ci-openshift-linuxptp-daemon-master-gofmt
86+
name: pull-ci-openshift-linuxptp-daemon-main-gofmt
8787
rerun_command: /test gofmt
8888
spec:
8989
containers:
@@ -128,15 +128,15 @@ presubmits:
128128
- agent: kubernetes
129129
always_run: true
130130
branches:
131-
- ^master$
132-
- ^master-
133-
cluster: build10
131+
- ^main$
132+
- ^main-
133+
cluster: build03
134134
context: ci/prow/images
135135
decorate: true
136136
labels:
137137
ci.openshift.io/generator: prowgen
138138
pj-rehearse.openshift.io/can-be-rehearsed: "true"
139-
name: pull-ci-openshift-linuxptp-daemon-master-images
139+
name: pull-ci-openshift-linuxptp-daemon-main-images
140140
rerun_command: /test images
141141
spec:
142142
containers:
@@ -182,15 +182,15 @@ presubmits:
182182
- agent: kubernetes
183183
always_run: false
184184
branches:
185-
- ^master$
186-
- ^master-
187-
cluster: build10
185+
- ^main$
186+
- ^main-
187+
cluster: build03
188188
context: ci/prow/security
189189
decorate: true
190190
labels:
191191
ci.openshift.io/generator: prowgen
192192
pj-rehearse.openshift.io/can-be-rehearsed: "true"
193-
name: pull-ci-openshift-linuxptp-daemon-master-security
193+
name: pull-ci-openshift-linuxptp-daemon-main-security
194194
optional: true
195195
rerun_command: /test security
196196
skip_if_only_changed: ^hack/|^bin/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|LICENSE)$
@@ -244,15 +244,15 @@ presubmits:
244244
- agent: kubernetes
245245
always_run: true
246246
branches:
247-
- ^master$
248-
- ^master-
249-
cluster: build10
247+
- ^main$
248+
- ^main-
249+
cluster: build03
250250
context: ci/prow/unit-test
251251
decorate: true
252252
labels:
253253
ci.openshift.io/generator: prowgen
254254
pj-rehearse.openshift.io/can-be-rehearsed: "true"
255-
name: pull-ci-openshift-linuxptp-daemon-master-unit-test
255+
name: pull-ci-openshift-linuxptp-daemon-main-unit-test
256256
rerun_command: /test unit-test
257257
spec:
258258
containers:

0 commit comments

Comments
 (0)