Page MenuHomePhabricator

Rename mainline branch from "master" to "main" in GitLab:repos/releng/release
Closed, ResolvedPublic

Description

As part of the migration to GitLab we want to ensure that the mainline branch name gets renamed from "master" to "main"

  • Announce the change of "master" → "main" on wikitech-l/ops-l w/timeline of 1 week
    • Ensure CodeSearch has needed changes—make code change, add @Legoktm as reviewer
  • Change branch name in GitLab
  • Change upstream name on deployment servers under /srv
  • Change upstream name on releases-jenkins for branch cut
  • Change upstream name on ci-jenkins for deployment-notes job
  • (Internal Release-Engineering-Team) update train-dev environment checkouts

Event Timeline

Steps for future migrations:

  1. Delete master branch in Gerrit
  2. Archive gerrit repo
  3. Rename mainline branch from "master"→"main"
  4. Bring up new repo in GitLab (with new "main" mainline branch)

The thinking here is:

  • Any automatic pulls from Gerrit will error out
  • BUT the local files will be left in tact

Change 893827 had a related patch set uploaded (by Jeena Huneidi; author: Jeena Huneidi):

[integration/config@master] dockerfiles/release-notes: releases branch rename

https://gerrit.wikimedia.org/r/893827

Change 893827 merged by jenkins-bot:

[integration/config@master] dockerfiles/release-notes: releases branch rename

https://gerrit.wikimedia.org/r/893827

Change 893844 had a related patch set uploaded (by Hashar; author: Hashar):

[integration/config@master] jjb: update for releases repo branch rename

https://gerrit.wikimedia.org/r/893844

Change 893844 merged by jenkins-bot:

[integration/config@master] jjb: update for releases repo branch rename

https://gerrit.wikimedia.org/r/893844

(Internal Release-Engineering-Team) update train-dev environment checkouts

^ is this still lingering?

(Internal Release-Engineering-Team) update train-dev environment checkouts

^ is this still lingering?

It's up to the individual to update this, so I think it's okay to close the task.

The master branch still exists at the moment which is confusing. I think we should delete it so that when people git pull to update theirs, they will find out about it not being there anymore (rather than thinking that there are no new changes).

The master branch still exists at the moment which is confusing. I think we should delete it so that when people git pull to update theirs, they will find out about it not being there anymore (rather than thinking that there are no new changes).

Oops, yes I should have deleted that already. I have just done so now.

dancy updated the task description. (Show Details)