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

Jump to bottom
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

DennisPeriquet wants to merge 2 commits into from

Conversation

@DennisPeriquet
Copy link
Contributor

@DennisPeriquet DennisPeriquet commented Mar 12, 2025

This PR is in support of renaming the default branch for https://github.com/openshift/cluster-api-provider-azure from 'master' to 'main'.

Unhold this PR only when:

/hold

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Mar 12, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 12, 2025

@DennisPeriquet: This pull request references Jira Issue OCPBUGS-53004, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This PR is in support of renaming the default branch for https://github.com/openshift/cluster-api-provider-azure from 'master' to 'main'.

Unhold this PR only when:

/hold

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 12, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from c35ceef to 0ba8bd0 Compare March 13, 2025 14:27
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch 2 times, most recently from 31b91bb to a438038 Compare March 31, 2025 14:21
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch 2 times, most recently from 21b3383 to 989ff8b Compare April 7, 2025 15:30
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from 989ff8b to 6f6fb24 Compare April 10, 2025 20:58
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from 6f6fb24 to 7132caa Compare April 23, 2025 17:42
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from 7132caa to 98f8f3c Compare May 12, 2025 13:34
This was referenced May 12, 2025
Open
Closed
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from 98f8f3c to d40bd4d Compare May 17, 2025 14:24
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from d40bd4d to 39ce410 Compare June 2, 2025 19:25
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from 39ce410 to a159ac7 Compare June 23, 2025 21:47
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch 2 times, most recently from 639c5f0 to f1e3b33 Compare July 14, 2025 17:51
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from f1e3b33 to bb6f8db Compare July 18, 2025 12:03
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from bb6f8db to 8296f1b Compare August 4, 2025 14:59
@damdo
Copy link
Member

damdo commented Aug 5, 2025

@nrb @DennisPeriquet what is the best way to coordinate the merge of this PR with openshift/cluster-api-provider-azure#336 ?

@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Aug 5, 2025

@damdo when you are ready, my team will do a 'master' to 'main' rename on this repo, we will then do a /pj-rehearse pull-ci-openshift-<repo>-main-images to ensure that things build given the new default branch name, if that passes, we will /pj-rehearse ack and /hold cancel which will allow the PR to merge.

Just let me know when you're ready.

@damdo
Copy link
Member

damdo commented Aug 5, 2025

@DennisPeriquet ok thanks a lot for the explanation. Let's see when @nrb is ready for it and then we can get this going.

@openshift-bot
Copy link
Contributor

openshift-bot commented Sep 4, 2025

Issues in openshift/release go stale after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 15d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Sep 11, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from 885621c to 16a4b2f Compare October 6, 2025 15:47
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 6, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: DennisPeriquet
Once this PR has been reviewed and has the lgtm label, please assign joelspeed for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Oct 13, 2025

/remove-lifecycle stale

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 13, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from 16a4b2f to fb9bb70 Compare October 13, 2025 11:28
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 13, 2025
@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 12, 2025

Issues in openshift/release go stale after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 15d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 12, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 12, 2025
@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 27, 2025

Stale issue in openshift/release rot after 15d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 15d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

@openshift-ci openshift-ci bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Nov 27, 2025
@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Nov 29, 2025

/remove-lifecycle rotten

@openshift-ci openshift-ci bot removed the lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. label Nov 29, 2025
@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Nov 29, 2025

/lifecycle frozen

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 29, 2025

@DennisPeriquet: The lifecycle/frozen label cannot be applied to Pull Requests.

Details

In response to this:

/lifecycle frozen

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from fb9bb70 to 8c28564 Compare November 29, 2025 15:42
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 29, 2025
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 29, 2025

Issues in openshift/release go stale after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 15d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 29, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 29, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53004_cluster-api-provider-azure_master-1 branch from 8c28564 to 438da6e Compare December 29, 2025 21:20
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 29, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 29, 2025

[REHEARSALNOTIFIER]
@DennisPeriquet: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-cluster-api-provider-azure-main-e2e-azure openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-e2e-azure-capi-techpreview openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-e2e-azure-manual-oidc openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-e2e-azure-serial-1of2 openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-e2e-azure-serial-2of2 openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-e2e-azure-techpreview openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-e2e-azurestack-ipi openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-hypershift-e2e-aks openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-images openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-okd-scos-e2e-aws-ovn openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-okd-scos-images openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-regression-clusterinfra-azure-ipi-techpreview-capi openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-unit openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-verify-commits openshift/cluster-api-provider-azure presubmit Presubmit changed
pull-ci-openshift-cluster-api-provider-azure-main-verify-deps openshift/cluster-api-provider-azure presubmit Presubmit changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 29, 2025

@DennisPeriquet: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Dec 29, 2025

/remove-lifecycle stale

@openshift-ci openshift-ci bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sunzhaohua2 sunzhaohua2 Awaiting requested review from sunzhaohua2

@damdo damdo Awaiting requested review from damdo

@deepsm007 deepsm007 Awaiting requested review from deepsm007

Assignees

No one assigned

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@DennisPeriquet @openshift-ci-robot @damdo @openshift-bot @openshift-merge-robot