Merge Duty for major ESR bump ============================= Intro ----- This manual describes how to set up a new ESR branch. The same process can be applied for any branch set up, with slight modifications. Example tracking bug: `Bug 1334535 - tracking bug for build and release of Firefox 52.0esr `__ Internal changes ---------------- This section covers changes to buildbot-configs and tools. See `Bug 1339832 `__ for the details and example changes. Some highlights: - Explicitly list the platforms (and use lock_platforms) since we don’t ship ESR to all mozilla-central/release platforms (android, for example) - Copy mozilla-beta configs, compare them to the previous ESR release and check if you understand what they stand for tools changes ~~~~~~~~~~~~~ - copy the old patcher config, so we can generate partial updates against the previous ESR release. - since the config patch introduces new configuration file(s) which are needed to be symlinked on the build/scheduler masters there is a need for a fabric methods to create the links It’s important that the buildbot-configs changes are landed and in production prior to adding the symlinks and adjusting production-masters.json. When you land these two changes you must immediately run the fabric method to put the symlinks in place to ensure the masters will continue to function correctly. External systems ---------------- CI relies on multiple systems, supported by different teams. File bugs in advance to make sure other teams have enough time to address the issue. Usually starting the whole process 2 weeks in advance of release builds (3 weeks before the release), gives enough time to everybody. Tasks ----- Below is the list of bugs filed as a part of the ESR52 cycle. Go through the list and verify that they are still valid for this ESR cycle and clone them if needed. +---------------------------+------------------------------------------+ | Bug | Title | +===========================+==========================================+ | `1333745 `__ | tracking flags | +---------------------------+------------------------------------------+ | `1335870 `__ | | +---------------------------+------------------------------------------+ | `1337061 `__ | | +---------------------------+------------------------------------------+ | `1337066 `__ | | +---------------------------+------------------------------------------+ | `1337087 `__ | | +---------------------------+------------------------------------------+ | `1337090 `__ | | +---------------------------+------------------------------------------+ | `1337091 `__ | | +---------------------------+------------------------------------------+ | `1337093 `__ | | +---------------------------+------------------------------------------+ | `1337366 `__ | | +---------------------------+------------------------------------------+ | `1337489 `__ | | +---------------------------+------------------------------------------+ | `1339057 `__ | | +---------------------------+------------------------------------------+ | `1339074 `__ | | +---------------------------+------------------------------------------+ | `1339076 `__ | | +---------------------------+------------------------------------------+ | `1339832 `__ | | +---------------------------+------------------------------------------+ | `1340669 `__ | | +---------------------------+------------------------------------------+ | `1341330 `__ | | +---------------------------+------------------------------------------+ | `1341491 `__ | | +---------------------------+------------------------------------------+ | `1342117 `__ | | +---------------------------+------------------------------------------+ | `1342204 `__ | | +---------------------------+------------------------------------------+ | `1342431 `__ | | +---------------------------+------------------------------------------+ | `1343097 `__ | | +---------------------------+------------------------------------------+ | `1343366 `__ | changes | +---------------------------+------------------------------------------+ Merge ----- Once mozilla-release is merged from mozilla-beta you can run the script which pulls last changes from mozilla-release, updates some configs and replaces some branding bits. Running gecko_migration.py for mozilla-esr ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The script will tag mozilla-release. It will continue by pulling mozilla-release to mozilla-esrNN, adjusting branding and changing some configs. Once the script finishes, run an hg diff to see the uncommitted changes that the script generated: :: ESR_VERSION=51 # checkout mozharness from the gecko tree using archiver wget https://hg.mozilla.org/build/tools/raw-file/default/buildfarm/utils/archiver_client.py python archiver_client.py mozharness --destination mozharness-esr$ESR_VERSION \ --repo releases/mozilla-esr$ESR_VERSION --rev default --debug # run the script python mozharness-esr$ESR_VERSION/scripts/merge_day/gecko_migration.py \ -c merge_day/release_to_esr.py hg -R build/mozilla-esr$ESR_VERSION diff python mozharness-esr$ESR_VERSION/scripts/merge_day/gecko_migration.py -c \ merge_day/release_to_esr.py --commit-changes --push The push should be available at Treeherder. In case of failure, you can start again from the top; no need to clobber (the on-by-default clean-repos action will be sufficient). It should be faster the second time, since you won’t be pulling in as many changesets from hg.m.o. Release builds -------------- Make sure to run a staging release. Update this documentation ------------------------- Keep this documentation up to date. Ship it! -------- Close the bug and have some tea. :)