Skip to content

OCPBUGS-53004: rename 'master' to 'main' for cluster-api-provider-azure #62706

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

Open
DennisPeriquet wants to merge 2 commits into
base: master
Choose a base branch
from
Open

OCPBUGS-53004: rename 'master' to 'main' for cluster-api-provider-azure #62706

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
e105a18
OCPBUGS-53004: rename 'master' to 'main' for cluster-api-provider-azure
DennisPeriquet Dec 29, 2025
438da6e
OCPBUGS-53004: run 'make jobs'
DennisPeriquet Dec 29, 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 ...iv-cluster-api-provider-azure-master.yaml → ...priv-cluster-api-provider-azure-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ tests:
workflow: openshift-e2e-azurestack
- as: verify-commits
commands: |
commitchecker --start ${PULL_BASE_SHA:-master}
commitchecker --start ${PULL_BASE_SHA:-main}
container:
from: commitchecker
optional: true
Expand All @@ -151,6 +151,6 @@ tests:
test:
- ref: go-verify-deps
zz_generated_metadata:
branch: master
branch: main
org: openshift-priv
repo: cluster-api-provider-azure
4 changes: 2 additions & 2 deletions ...ft-cluster-api-provider-azure-master.yaml → ...hift-cluster-api-provider-azure-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ tests:
workflow: openshift-e2e-azurestack
- as: verify-commits
commands: |
commitchecker --start ${PULL_BASE_SHA:-master}
commitchecker --start ${PULL_BASE_SHA:-main}
container:
from: commitchecker
optional: true
Expand All @@ -151,6 +151,6 @@ tests:
test:
- ref: go-verify-deps
zz_generated_metadata:
branch: master
branch: main
org: openshift
repo: cluster-api-provider-azure
2 changes: 1 addition & 1 deletion ...-api-provider-azure-master__okd-scos.yaml → ...er-api-provider-azure-main__okd-scos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ tests:
cluster_profile: aws
workflow: openshift-e2e-aws
zz_generated_metadata:
branch: master
branch: main
org: openshift
repo: cluster-api-provider-azure
variant: okd-scos
6 changes: 3 additions & 3 deletions ...pi-provider-azure-master-postsubmits.yaml → ...-api-provider-azure-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: build09
- ^main$
cluster: build01
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-azure-master-images
name: branch-ci-openshift-priv-cluster-api-provider-azure-main-images
path_alias: sigs.k8s.io/cluster-api-provider-azure
spec:
containers:
Expand Down
102 changes: 51 additions & 51 deletions ...api-provider-azure-master-presubmits.yaml → ...r-api-provider-azure-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: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-azure
decorate: true
decoration_config:
Expand All @@ -18,7 +18,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: azure-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-e2e-azure
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-e2e-azure
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test e2e-azure
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
Expand Down Expand Up @@ -86,9 +86,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-azure-capi-techpreview
decorate: true
decoration_config:
Expand All @@ -101,7 +101,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: azure-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-e2e-azure-capi-techpreview
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-e2e-azure-capi-techpreview
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test e2e-azure-capi-techpreview
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
Expand Down Expand Up @@ -169,9 +169,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-azure-manual-oidc
decorate: true
decoration_config:
Expand All @@ -184,7 +184,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: azure-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-e2e-azure-manual-oidc
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-e2e-azure-manual-oidc
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test e2e-azure-manual-oidc
Expand Down Expand Up @@ -252,9 +252,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-azure-serial-1of2
decorate: true
decoration_config:
Expand All @@ -267,7 +267,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: azure-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-e2e-azure-serial-1of2
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-e2e-azure-serial-1of2
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test e2e-azure-serial-1of2
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
Expand Down Expand Up @@ -336,9 +336,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-azure-serial-2of2
decorate: true
decoration_config:
Expand All @@ -351,7 +351,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: azure-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-e2e-azure-serial-2of2
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-e2e-azure-serial-2of2
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test e2e-azure-serial-2of2
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
Expand Down Expand Up @@ -420,9 +420,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-azure-techpreview
decorate: true
decoration_config:
Expand All @@ -435,7 +435,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: azure4
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-e2e-azure-techpreview
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-e2e-azure-techpreview
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test e2e-azure-techpreview
Expand Down Expand Up @@ -503,8 +503,8 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-azurestack-ipi
decorate: true
Expand All @@ -519,7 +519,7 @@ presubmits:
ci-operator.openshift.io/cluster: build01
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-e2e-azurestack-ipi
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-e2e-azurestack-ipi
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test e2e-azurestack-ipi
Expand Down Expand Up @@ -587,9 +587,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/hypershift-e2e-aks
decorate: true
decoration_config:
Expand All @@ -602,7 +602,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-azure-master-hypershift-e2e-aks
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-hypershift-e2e-aks
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test hypershift-e2e-aks
spec:
Expand Down Expand Up @@ -669,9 +669,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/images
decorate: true
decoration_config:
Expand All @@ -682,7 +682,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-images
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-images
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test images
spec:
Expand Down Expand Up @@ -732,9 +732,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/regression-clusterinfra-azure-ipi-techpreview-capi
decorate: true
decoration_config:
Expand All @@ -747,7 +747,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: azure4
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-regression-clusterinfra-azure-ipi-techpreview-capi
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-regression-clusterinfra-azure-ipi-techpreview-capi
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test regression-clusterinfra-azure-ipi-techpreview-capi
Expand Down Expand Up @@ -816,9 +816,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/unit
decorate: true
decoration_config:
Expand All @@ -829,7 +829,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-unit
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-unit
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test unit
spec:
Expand Down Expand Up @@ -879,9 +879,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/verify-commits
decorate: true
decoration_config:
Expand All @@ -892,7 +892,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-verify-commits
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-verify-commits
optional: true
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test verify-commits
Expand Down Expand Up @@ -943,9 +943,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build04
- ^main$
- ^main-
cluster: build01
context: ci/prow/verify-deps
decorate: true
decoration_config:
Expand All @@ -956,7 +956,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-priv-cluster-api-provider-azure-master-verify-deps
name: pull-ci-openshift-priv-cluster-api-provider-azure-main-verify-deps
path_alias: sigs.k8s.io/cluster-api-provider-azure
rerun_command: /test verify-deps
spec:
Expand Down
12 changes: 6 additions & 6 deletions ...pi-provider-azure-master-postsubmits.yaml → ...-api-provider-azure-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$
cluster: build09
- ^main$
cluster: build01
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-azure-master-images
name: branch-ci-openshift-cluster-api-provider-azure-main-images
path_alias: sigs.k8s.io/cluster-api-provider-azure
spec:
containers:
Expand Down Expand Up @@ -62,8 +62,8 @@ postsubmits:
- agent: kubernetes
always_run: true
branches:
- ^master$
cluster: build09
- ^main$
cluster: build01
decorate: true
decoration_config:
skip_cloning: true
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-azure-master-okd-scos-images
name: branch-ci-openshift-cluster-api-provider-azure-main-okd-scos-images
spec:
containers:
- args:
Expand Down
Loading