Consists of roughly 4 individual days of work. Each day you must action several sequential tasks. The 4 days are spread out over about 18 days
- Merge Prep Day: day we prepare for the upcoming 'Release Merge Day' and 'Stabilizing Branch Merge Day'
- when: day 1 - usually a monday and 1 week before 'Release Merge Day'
- Release Merge Day: day we merge csets from 'm-b -> m-r'
- when: day 7 usually a mon and 1 week before 'Stabilizing Branch Merge Day'
- Stabilizing Branches Merge Day: day we merge csets from 'm-a -> m-b' and 'm-c -> m-a'
- when: day 14 usually a mon and 1 day before 'Release Day'
- Release Day: official day of release
- when: day 15 usually a Tues
- Unthrottle Day: day we unthrottle m-a (usually)
- when: day 18 usually Fri
- read the docs: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty and https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps
- Introduce yourself as the MergeDuty Point of contact with Release Management. email: release-drivers@mozilla.com, irc: #release-drivers
- patch and get review for two bbot-cfgs gecko version bump patches (DONT LAND YET)
- patch 1: for m-r. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Bump_the_buildbot-configs_gecko_version_for_mozilla-release example: https://bug1123369.bugzilla.mozilla.org/attachment.cgi?id=8580307
- patch 2: for m-b, m-a, m-c and comm branches. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Bump_the_buildbot-configs_gecko_version_for_other_branches example: https://bug1123369.bugzilla.mozilla.org/attachment.cgi?id=8580308
- 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: example: https://bugzilla.mozilla.org/showdependencytree.cgi?id=1123369&hide_resolved=0
- do a no-op trial run of performing the mozilla-beta -> mozilla-release migration. e.g.
python mozharness/scripts/merge_day/gecko_migration.py -c mozharness/configs/merge_day/beta_to_release.py(NOTE: DO NOT ADD --commit-changes, --push, or --trigger-builders actions)
- 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: example: https://bugzilla.mozilla.org/showdependencytree.cgi?id=1123369&hide_resolved=0
- land previously reviewed m-r gecko version bbotcfgs patch
- reconfig
- wait for go-to-merge m-r email from release-drivers@mozilla.com before moving on
- perform the mozilla-beta -> mozilla-release migration doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Perform_mozilla-beta_-.3E_mozilla-release_migration
- close m-b. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Close_mozilla-beta
- run gecko_migration.py script: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Running_gecko_migration.py_for_mozilla-release
- uplift locales from cruncher by running beta2release_l10n.sh https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Uplift_locales
- notify r-d that migration has been completed!
- run the b2g_tag script with --pull to clone the repos ahead of time
- do a no-op trial run of performing the mozilla-aurora -> mozilla-beta migration. e.g.
python mozharness/scripts/merge_day/gecko_migration.py -c mozharness/configs/merge_day/aurora_to_beta.py(NOTE: DO NOT ADD --commit-changes, --push, or --trigger-builders actions) - do a no-op trial run of performing the mozilla-central -> mozilla-aurora migration. e.g.
python mozharness/scripts/merge_day/gecko_migration.py -c mozharness/configs/merge_day/central_to_aurora.py(NOTE: DO NOT ADD --commit-changes, --push, or --trigger-builders actions)
- 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: example: https://bugzilla.mozilla.org/showdependencytree.cgi?id=1123369&hide_resolved=0
- land previously reviewed m-b, m-a, m-c and comm branches gecko version bbotcfgs patch
- reconfig
- wait for go-to-merge m-a->m-b, m-c->m-a email from release-drivers@mozilla.com before moving on
- perform the m-a->m-b, m-c->m-a migrations. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Perform_mozilla-aurora_-.3E_mozilla-beta_and_mozilla-central_-.3E_mozilla-aurora_migrations
- close m-a. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Close_mozilla-aurora
- Running gecko_migration.py for mozilla-beta. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Running_gecko_migration.py_for_mozilla-beta
- Ping Standard8, Callek, and Pike in #r-d to warn about push
- reopen m-b. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Re-open_mozilla-beta
- Running gecko_migration.py for mozilla-auroa. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Running_gecko_migration.py_for_mozilla-aurora
- Ping Standard8, Callek, and Pike in #r-d to warn about push
- Change Template Version Numbers with update_merge_day_wiki.sh script. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Change_Template_Version_Numbers
- Double check that the wiki changes happened properly! doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Double_check_that_the_wiki_changes_happened_properly.21
- Send Merge Completion Email. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Double_check_that_the_wiki_changes_happened_properly.21
- re-open m-a. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Re-open_mozilla-aurora
- Axel will most likely be doing the l10n migrations (releng doesn't run a beta2release_l10n.sh script for other l10n migrations)
- Bump bouncer entry versions. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Bump_bouncer_entry_versions
- Tag B2G Gecko+Gaia for MERGEDAY. doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Tag_B2G_Gecko.2BGaia_for_MERGEDAY
- keep an eye for any requests but usually there is nothing to do with regards to merge work
- Around the Friday of merge week, RelMan will ask to Unthrottle Aurora nightly updates: doc: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Unthrottle_Aurora_nightly_updates
- Update this documentation with any new changes: https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty !!!
did a no-op run of the beta_to_release migration script. how's it look @rail ?
http://people.mozilla.org/~jlund/beta_to_release_info.log