Overview

When a mozilla-central is an odd numbered Gecko version and will become an even numbered Gecko version, the B2G version on mozilla-central will stay, and the B2G version in mozilla-aurora will move to a mozilla-b2gXX_vX_X repo. For B2G 1.3, Gecko 28 moved from mozilla-aurora to mozilla-b2g28_v1_3.

See this bug.

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 l10n hg repositories

• 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
• Prep work for Adding a new B2G Gecko branch. If you can roll this out now, you're ahead of the curve.

Release Merge Day

• bump the buildbot-configs release version
  • And any other patches that needed to land before the migration.
  • Reconfig and merge mozharness!

• perform the mozilla-beta -> mozilla-release migration
  • The release go-to-build is dependent on the migration.

One week before

• Release Merge Day + the release build will take up the first portion of this week.
• Get the new B2G gecko branch live and green, if you haven't already.
• 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.

• Prep to update Gaia l10n vcs-sync

• run the b2g_tag script with --pull to clone the repos ahead of time.

Merge Day

• update Gaia l10n vcs-sync
• bump the other buildbot-config gecko versions
  • And any other patches that needed to land before the migration.
• kill the aurora b2g builds+tests
• Reconfig and merge mozharness!
• Pause gecko.git vcs-sync
• Pause Gecko l10n vcs-sync

• perform the mozilla-aurora -> mozilla-beta & mozilla-central -> mozilla-aurora migrations
  • The beta go-to-build is dependent on the migration.
  • If you need to refresh b2gXX, ideally push there from aurora *before* the central->aurora migration
  • Axel will most likely be doing the l10n migrations.

• restart vcs-sync
• restart gecko l10n vcs-sync

• Update mozharness for b2gXX
• Tag B2G Gecko+Gaia for MERGEDAY
• Point B2G Aurora updates at newly created B2G branch
• Create new hg bundles

dev.b2g newsgroup post

Like this:

Patches that are blocking-b2g:1.3+ should be landed there now. For more information, see the page below which always contains the latest information.
https://wiki.mozilla.org/Release_Management/B2G_Landing#v1.3.0

As a reminder, B2G v1.4 development remains on mozilla-central through the duration of the Gecko 30 development cycle due to end on March 17, so there is no change for where v1.4 patches are to land.

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 mergeduty will appreciate it!