Release Management/B2G Landing

TL;DR

Taken from https://etherpad.mozilla.org/B2G-Clarifications

Current Codename/Version Mappings

• tef+ -> v1.0.0 (tagged close to FF18's release)
• shira+ -> v1.0.1 (tagged close to FF19's release)
• leo+ -> v1.1.0 (tagged close to FF20's release)

Pictoral Explanation

• Click here

Upcoming Dates

• 2/13 - v1.0.1 will be branched off of mozilla-b2g18/v1-train (DONE)
• ~2/14 - leo+ bugs will start getting cherry picked from mozilla-central/master to mozilla-b2g18/v1-train for v1.1.0
• 4/15 - v1.1.0 will be branched off of mozilla-b2g18/v1-train

Nominating Issues

• If an issue is a requirement or is thought to be critical for v1.0.0 specifically, please set blocking-b2g:tef?
• If an issue is a requirement or is thought to be critical for v1.0.1 specifically, please set blocking-b2g:shira?
• If an issue is a requirement or is thought to be critical for v1.1.0 specifically, please set blocking-b2g:leo?
• If an issue should be fixed in the v1 timeframe, but is not critical for a specific release, set tracking-b2g18:?

Work Order

• tef+ (v1.0.0) blocker bugs
  • http://mzl.la/14wBvN4
  • http://mzl.la/TZaG2i (fixed, not yet landed on v1.0.0 branch)
• shira+ (v1.0.1) blocker bugs
  • http://bit.ly/VseBBA
• leo+ (v1.1.0) blocker bugs
  • http://bit.ly/VseINx
• tracking-b2g18 (+, 19+, 20+, etc.)
  • http://bit.ly/VocUDt
  • None of these issues are critical, nor would they block a specific release, nor should they be uplifted to branched releases. 19/20/21+ can be used as a method of targeting the fix for a specific version, but can be ignored on the Gaia side.
  • Tracked bugs will not necessarily be approved for landing, since a risk/reward evaluation is required
  • Please note that in the days coming up to a branch (2/15, for instance) we may hold approvals for tracked bugs until the following release to prevent regressions

Landing tef+ bugs for v1.0.0/v1.0.1 (updated 2/13)

• r+ is required
• Land to master (Gaia) or mozilla-central (Gecko) and mark the bug as Resolved/Fixed
• If things look good on master / mozilla-central, then uplift to:
  • v1-train/mozilla-b2g18 (setting status-b2g18:fixed)
  • v1.0.1/mozilla-b2g18_v1_0_1 (setting status-b2g18-v1.0.1:fixed)
  • v1.0.0/mozilla-b2g18_v1_0_0 (setting status-b2g18-v1.0.0:fixed)

Landing shira+ bugs for v1.0.1 (updated 2/13)

• r+ is required
• Land to master (Gaia) or mozilla-central (Gecko) and mark the bug as Resolved/Fixed
• If things look good on master / mozilla-central, then uplift to:
  • v1-train/mozilla-b2g18 (setting status-b2g18:fixed)
  • v1.0.1/mozilla-b2g18_v1_0_1 (setting status-b2g18-v1.0.1:fixed)

Landing tracking-b2g18+ bugs for v1.x

• r+ is required
• Land to mozilla-central (Gecko) or master (Gaia) and mark the bug as Resolved/Fixed
• Nominate for approval-gaia-v1 or approval-mozilla-b2g18
• Once approved, the bug can be uplifted to v1-train/mozilla-b2g18 (setting status-b2g18:fixed)
• Until 2/18, approval-gaia-v1 and approval-mozilla-b2g18 can follow the shira+ rules above and land to v1.0.1 branches/repos

Landing leo+ bugs for v1.1.0 (updated 2/13)

• r+ is required
• Land to mozilla-central (Gecko) or master (Gaia) and mark the bug as Resolved/Fixed
• If things look good on m-c/master, uplift to v1-train/mozilla-b2g18 (setting status-b2g18:fixed)

More Details

After tagging 1.0.1rc1 on 2/13 (now)

NOTE: For Gecko, all v1 landings must make it onto mozilla-central and tip of mozilla-b2g18. For Gaia, all v1 changes must land to master and the ongoing v1 branch ("v1-train").

v1.0.0

• Gecko: mozilla-b2g18_v1_0_0
• Gaia: v1.0.0 branch ("v1.0.0")
• B2G Manifests: v1.0.0 branch ("v1-train")
• L10N: TBD

v1.0.1

• Gecko: mozilla-b2g18_v1_0_1
• Gaia: v1.0.1 branch ("v1.0.1")
• B2G Manifests: v1.0.1 branch (naming TBD)
• L10N: master

v1.1.0

• Gecko: tip of mozilla-b2g18
• Gaia: ongoing v1 branch ("v1-train")
• B2G Manifests: ongoing v1 branch (naming TBD)
• L10N: TBD

v2 and post-v1.1.0 work

Same as above.

...

More guidance once we get past these dates.

Approvals (updated 2/13)

• What doesn't need approval-mozilla-b2g18/approval-gaia-v1
  • tef+ bugs can land directly on the current v1.0.0/v1.0.1 branches (see above)
  • shira+ bugs can land directly on the current v1.0.1 branches (see above)
  • leo+ bugs can land on the appropriate v1.1.0 branches (see above)
• What does need approval-mozilla-b2g18/approval-gaia-v1
  • Bugs that aren't blocking-b2g plus'd
  • Approved bugs will land to Gecko mozilla-b2g18 tip and the ongoing v1 Gaia branch (to be picked up in the next tag)
• What we won't approve
  • Bugs that aren't tracking-b2g18 plus'd

Bug Flags

• blocking-b2g:codename? is for CRITICAL bug fixes that we'd like to be considered for v1.* branches (based on codename)
• blocking-b2g:codename+ is for bugs that we've got agreement with partners about needing as part of the associated version
• tracking-b2g18:+ ensures that it'll be on our radar for the v1 timeframe, and tracking-b2g18:? represents a nomination
• tracking-b2g18:19+ ensures that it will be on our radar for the 6 weeks after v1.0 code ships (to be fixed prior to FF19's release). This flag will be used for security bugs fixed in FF19, for instance. Similarly, we'll be using 20+, 21+, etc.

Bug Status

• Bug resolution (Resolved/Fixed) applies specifically to mozilla-central
• status-b2g18* represents the fix status on the Gecko/Gaia v1.* branches. Only set this flag once landed on all necessary branches, based upon the guide above

Update Channels

• Nightly/Beta channel users will receive updates for v1.0.0 until 1/25. After 1/25, they will receive updates to v1.0.1 until a time TBD
• A v2 Nightly channel will be created soon, at a time TBD