Overview

When a mozilla-central is an even numbered Gecko version and will become an odd numbered Gecko version, the B2G version on mozilla-central will migrate into mozilla-aurora, and a new B2G version will start on mozilla-central. For B2G 1.3, when Gecko 28 merges into mozilla-aurora, mozilla-central will become 1.4 and mozilla-aurora will be 1.3.

Two weeks before

• Read these docs. They're still fairly new as of Feb 7 2014, and they may not be 100% accurate or smooth yet. Please do your part to familiarize yourself with what needs doing.
• Communicate with Release Management to determine what features are going to merge from central->aurora, aurora->beta, and which will be pref'ed off.

• File a bug for new Gaia hg repository

• Prep the patch for the mozilla-release bump in buildbot-configs
  • Look at blocking bugs against the merge day bugs, and ask around if there are any patches that need to land with the release migration
• Prep the other patches for Release Merge Day

Release Merge Day

• bump the buildbot-configs release version
  • And any other patches that needed to land before the migration.
  • Reconfig and merge mozharness!
• Wait for a go-to-merge (happens on Monday)
• perform the mozilla-beta -> mozilla-release migration
  • The release go-to-build is dependent on the migration.
    • this includes the l10n beta->release migrations.

One week before

Release Merge Day + the release build will take up the first portion of this week.

• Prep for merging the B2G version from central -> Aurora. This will go live on Merge Day.
• Prep for creating new b2g git branches. This is a staging run to make sure you don't hit any weird issues on Merge Day, and pull the source down to disk to save time.
• Prep to add new Gaia and l10n to vcs-sync
• Prep the patch for the other desktop train migrations
  • Look at blocking bugs against the merge day bugs, and ask around if there are any patches that need to land with the other migrations
• Prep the other patches for Merge Day (next section). Merge Day will be Very Busy, so the patches+reviews beforehand will be very important.
• run the b2g_tag script with --pull to clone the repos ahead of time.

Merge Day

• Notify dev.b2g newsgroup about the merge
• Create new b2g git branches
• Bump gecko.git vcs-sync
• bump the other buildbot-config gecko versions
  • And any other patches that needed to land before the migration.

• Pause Gecko l10n vcs-sync
• add new Gaia and l10n to vcs-sync

• perform the mozilla-aurora -> mozilla-beta & mozilla-central -> mozilla-aurora migrations
  • The beta go-to-build is dependent on the migration.
  • Axel will most likely be doing the l10n migrations.

• Merge the b2g version from central to aurora
• Repoint B2G updates at Aurora
• EOL a B2G branch, if appropriate.

• Restart Gecko l10n

• Tag B2G Gecko+Gaia for MERGEDAY

dev.b2g newsgroup post

Like this:

We have created the v1.3 branch in all git repos. The master branch is now reserved for 1.4 development. For more information, see the page below which always contains the latest information.
https://wiki.mozilla.org/Release_Management/B2G_Landing#v1.3.0

Post merge day

• Around the Friday of merge week, RelMan will be ask to Unthrottle Aurora nightly updates.

Update this documentation

The next person on merge duty will appreciate it!