Skip to content

OCPBUGS-53003: rename 'master' to 'main' for cluster-api-provider-aws #62705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
May 13, 2025
Merged

OCPBUGS-53003: rename 'master' to 'main' for cluster-api-provider-aws #62705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f3142
OCPBUGS-53003: rename 'master' to 'main' for cluster-api-provider-aws
DennisPeriquet May 13, 2025
b60c00c
OCPBUGS-53003: run 'make jobs'
DennisPeriquet May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...priv-cluster-api-provider-aws-master.yaml → ...t-priv-cluster-api-provider-aws-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ tests:
workflow: hypershift-aws-e2e-external
- as: verify-commits
commands: |
commitchecker --start ${PULL_BASE_SHA:-master}
commitchecker --start ${PULL_BASE_SHA:-main}
container:
from: commitchecker
optional: true
Expand All @@ -138,6 +138,6 @@ tests:
test:
- ref: go-verify-deps
zz_generated_metadata:
branch: master
branch: main
org: openshift-priv
repo: cluster-api-provider-aws
4 changes: 2 additions & 2 deletions ...hift-cluster-api-provider-aws-master.yaml → ...nshift-cluster-api-provider-aws-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ tests:
workflow: hypershift-aws-e2e-external
- as: verify-commits
commands: |
commitchecker --start ${PULL_BASE_SHA:-master}
commitchecker --start ${PULL_BASE_SHA:-main}
container:
from: commitchecker
optional: true
Expand All @@ -139,6 +139,6 @@ tests:
test:
- ref: go-verify-deps
zz_generated_metadata:
branch: master
branch: main
org: openshift
repo: cluster-api-provider-aws
2 changes: 1 addition & 1 deletion ...er-api-provider-aws-master__okd-scos.yaml → ...ster-api-provider-aws-main__okd-scos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ tests:
cluster_profile: aws
workflow: openshift-e2e-aws
zz_generated_metadata:
branch: master
branch: main
org: openshift
repo: cluster-api-provider-aws
variant: okd-scos
6 changes: 3 additions & 3 deletions ...-api-provider-aws-master-postsubmits.yaml → ...er-api-provider-aws-main-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ postsubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
cluster: build06
- ^main$
cluster: build05
decorate: true
decoration_config:
oauth_token_secret:
Expand All @@ -15,7 +15,7 @@ postsubmits:
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
name: branch-ci-openshift-priv-cluster-api-provider-aws-master-images
name: branch-ci-openshift-priv-cluster-api-provider-aws-main-images
path_alias: sigs.k8s.io/cluster-api-provider-aws
spec:
containers:
Expand Down
88 changes: 44 additions & 44 deletions ...r-api-provider-aws-master-presubmits.yaml → ...ter-api-provider-aws-main-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build07
context: ci/prow/e2e-aws-capi-techpreview
decorate: true
decoration_config:
Expand All @@ -18,7 +18,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: aws-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-e2e-aws-capi-techpreview
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-aws-capi-techpreview
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test e2e-aws-capi-techpreview
Expand Down Expand Up @@ -87,9 +87,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build07
context: ci/prow/e2e-aws-ovn
decorate: true
decoration_config:
Expand All @@ -102,7 +102,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: aws-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-e2e-aws-ovn
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-aws-ovn
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test e2e-aws-ovn
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
Expand Down Expand Up @@ -170,9 +170,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build07
context: ci/prow/e2e-aws-ovn-techpreview
decorate: true
decoration_config:
Expand All @@ -185,7 +185,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: aws-3
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-e2e-aws-ovn-techpreview
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-aws-ovn-techpreview
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test e2e-aws-ovn-techpreview
Expand Down Expand Up @@ -254,9 +254,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build07
context: ci/prow/e2e-aws-serial
decorate: true
decoration_config:
Expand All @@ -269,7 +269,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: aws-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-e2e-aws-serial
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-aws-serial
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test e2e-aws-serial
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
Expand Down Expand Up @@ -337,9 +337,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build05
context: ci/prow/e2e-hypershift
decorate: true
decoration_config:
Expand All @@ -352,7 +352,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: hypershift
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-e2e-hypershift
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-hypershift
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test e2e-hypershift
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
Expand Down Expand Up @@ -420,9 +420,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build05
context: ci/prow/images
decorate: true
decoration_config:
Expand All @@ -433,7 +433,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-images
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-images
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test images
spec:
Expand Down Expand Up @@ -483,9 +483,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build07
context: ci/prow/regression-clusterinfra-aws-ipi-proxy-techpreview
decorate: true
decoration_config:
Expand All @@ -498,7 +498,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: aws-3
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-regression-clusterinfra-aws-ipi-proxy-techpreview
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-regression-clusterinfra-aws-ipi-proxy-techpreview
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test regression-clusterinfra-aws-ipi-proxy-techpreview
Expand Down Expand Up @@ -566,9 +566,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build05
context: ci/prow/security
decorate: true
decoration_config:
Expand All @@ -579,7 +579,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-security
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-security
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test security
spec:
Expand Down Expand Up @@ -636,9 +636,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build05
context: ci/prow/unit
decorate: true
decoration_config:
Expand All @@ -649,7 +649,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-unit
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-unit
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test unit
spec:
Expand Down Expand Up @@ -699,9 +699,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build05
context: ci/prow/verify-commits
decorate: true
decoration_config:
Expand All @@ -712,7 +712,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-verify-commits
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-verify-commits
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test verify-commits
Expand Down Expand Up @@ -763,9 +763,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build11
- ^main$
- ^main-
cluster: build05
context: ci/prow/verify-deps
decorate: true
decoration_config:
Expand All @@ -776,7 +776,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-aws-master-verify-deps
name: pull-ci-openshift-priv-cluster-api-provider-aws-main-verify-deps
path_alias: sigs.k8s.io/cluster-api-provider-aws
rerun_command: /test verify-deps
spec:
Expand Down
8 changes: 4 additions & 4 deletions ...-api-provider-aws-master-postsubmits.yaml → ...er-api-provider-aws-main-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ postsubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^main$
cluster: build05
decorate: true
labels:
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
name: branch-ci-openshift-cluster-api-provider-aws-master-images
name: branch-ci-openshift-cluster-api-provider-aws-main-images
path_alias: sigs.k8s.io/cluster-api-provider-aws
spec:
containers:
Expand Down Expand Up @@ -62,7 +62,7 @@ postsubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^main$
cluster: build05
decorate: true
decoration_config:
Expand All @@ -72,7 +72,7 @@ postsubmits:
ci-operator.openshift.io/variant: okd-scos
ci.openshift.io/generator: prowgen
max_concurrency: 1
name: branch-ci-openshift-cluster-api-provider-aws-master-okd-scos-images
name: branch-ci-openshift-cluster-api-provider-aws-main-okd-scos-images
spec:
containers:
- args:
Expand Down
Loading