Skip to content
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.

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

[DPTP-4326] Updated branches references from "master" to "main" #4523

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

hector-vido
Copy link
Contributor

Various references of master branch was renamed to main, this include:

  • The minimum tests possible;
  • References to openshift/release@master and;
  • Default branch names used by some tools.

Copy link
Contributor

openshift-ci bot commented Mar 11, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hector-vido

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

The pull request process is described here

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 11, 2025
@Prucek
Copy link
Member

Prucek commented Mar 12, 2025

This change needs to be announced to the public and it should be merged right after you rename the branches on o/release and o/ci-tools. I would even announce it beforehand (on XX of March we will rename branches, expect outage for X hours)

@DennisPeriquet
Copy link
Contributor

Our team (CRT) is working to get openshift repos renamed from 'master' to 'main' (working with repo owners who have a better understanding of the consequences of the rename that we do) but I don't know who is planning to do the openshift/release default branch rename.

We think that the o/release repo will be one of the last (if not the very last) repo to rename. As I expect the effects to be broad (though I admit I don't really know how broad), I agree with @Prucek that we will, at the very least, need to announce it with sufficient notice and have some kind of revert/backout/mitigation plan if things go sideways.

@hector-vido hector-vido changed the title Updated branches references from "master" to "main" [DPTP-4326] Updated branches references from "master" to "main" Mar 12, 2025
@hector-vido
Copy link
Contributor Author

/hold Needs to synchronize with openshift/release

@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
Copy link
Contributor

openshift-ci bot commented Mar 12, 2025

@hector-vido: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/breaking-changes f7f0f58 link false /test breaking-changes
ci/prow/integration f7f0f58 link true /test integration
ci/prow/images f7f0f58 link true /test images

Full PR test history. Your PR dashboard.

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.

Copy link
Contributor

@jmguzik jmguzik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this PR should be the focus first.
I also think it is not as straightforward as it looks like in this PR.

Whenever "master" is missing in code, it should not be replaced with "main", rather "main" should be added as an option to treat "main" and "master" equally. It is the only path towards smooth transition.

@@ -144,9 +144,9 @@ func main() {
}

// TODO fix the bumper in upstream to retrieve a default branch
defaultBranch := "master"
defaultBranch := "main"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This as an example, main should be equal option in the code, not just replacement

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants