Fwd: [Action Required] Master to Main branch migration for infra/infra repo starting on 11/09/2020

2 views
Skip to first unread message

Robert Ma

unread,
Oct 30, 2020, 7:00:55 PM10/30/20
to ecosystem-infra
Hi team, I've confirmed that we do need to adjust our importer/exporter for this and filed https://crbug.com/1144338 . The change shouldn't be too complicated and the timeframe seems very reasonable. I'll look closer next week but let me know if I missed anything or you have other concerns.

---------- Forwarded message ---------
From: Normando <Unknown>
Date: Friday, October 30, 2020 at 3:25:21 PM UTC-4
Subject: [Action Required] Master to Main branch migration for infra/infra repo starting on 11/09/2020
To: mainbranch...@chromium.org <Unknown>


BCC: infra-a...@chromium.org


[ACTION REQUIRED] Tool owners  (e.g. luci scheduler, copybara, autoroller), between transition stage “New main branch created” and “Master branch divergence” (depicted below) your tools and LUCI jobs need to start reading "main" instead of "master".


Hello Chrome Infra,


As part of the project code inclusion efforts, the Chrome Operations Source team will start this 2020 Q4 to rename “master” branches to “main”. More specifically, this quarter we will do this for two repos: infra/infra and chromium/src. The rest of the repositories are targeted for the first half of 2021.


Migration of infra/infra is scheduled to start on Monday November 9th (This email pertains to infra/infra only, the dates for chromium/src will be announced at a later date). During this time you can continue to interact as usual with this repo if you rely on depot_tools. Branch migration work will happen in a seamless manner to depot_tools users. 


In summary the migration consists of the next 5 stages:


  • Legacy state. This is the current state, i.e. the main branch does not exist yet.

  • Transitional period.

    • New main branch created. [ETA 11/9]. Main branch is created,  CLs should  start to be sent and submitted to it. New git clones will have main as their default branch. All existing CLs will be moved to main branch. CLs are still accepted in the master branch, but are not submittable. Such CLs will be moved to main branch by a LUCI cron job, scheduled to run every 5 minutes. Master branch will be kept in sync with the main branch.

    • Master branch divergence. [ETA 11/19]. While CLs are still accepted in the master branch, but not submittable (same as in previous stage), master branch is no longer kept in sync with the main branch, i.e master branch has diverged from main.

    • Master submission closed. [ETA 11/24]. CLs are no longer accepted in the master branch, neither submittable. If  you still try to perform any of these actions explicitly, depot tools will try to route these to main. 

  • Master branch deleted. [ETA 1-20-2021]. Master branch does not exist anymore. 


To learn more about how this migration is being done,  refer to:  


In the case you run into any issues during this migration please let us know with a bug here or at mainbranch...@chromium.org

Thank you,

Josip Sokcevic and Norman Rosas on behalf of the ChOps Source team.

--
You received this message because you are subscribed to the Google Groups "infra-announce" group.
To unsubscribe from this group and stop receiving emails from it, send an email to infra-announc...@chromium.org.
To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/infra-announce/CAM6u63FP7z3fQJS%2B1D9wWyn3kckcB6JWtJxy1hrn8Rus9zyrfw%40mail.gmail.com.

Robert Ma

unread,
Nov 2, 2020, 10:41:19 AM11/2/20
to ecosystem-infra
Sorry I realized the PSA was for infra/infra instead of chromium/src. According to the project plan, the migration of chromium/src will start a little later on November 30 and the transition period will be longer.

You received this message because you are subscribed to the Google Groups "ecosystem-infra" group.
To unsubscribe from this group and stop receiving emails from it, send an email to ecosystem-inf...@chromium.org.
To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/ecosystem-infra/98d5477e-b562-4179-8191-decaf47377dfn%40chromium.org.

Stephen Mcgruer

unread,
Nov 3, 2020, 8:54:06 AM11/3/20
to Robert Ma, ecosystem-infra
Thanks for being on top of this Robert! Will follow up in the bug.

Reply all
Reply to author
Forward
0 new messages