Instructions: https://wiki.mozilla.org/ReleaseEngineering:MergeDuty

# MERGE DAY - pulseaudio-libs-devel package rides the trains (bug 662417) # MERGE DAY - Remove branches as FF21 reaches them

# MERGE DAY NOTE: remove v21 based branches from the list below NON_UBUNTU_BRANCHES = ("mozilla-beta", "mozilla-release", "mozilla-esr17", "mozilla-b2g18", "mozilla-b2g18_v1_0_0", "mozilla-b2g18_v1_0_1")

Merge is scheduled for the 13th, release on the 14th, per https://wiki.mozilla.org/RapidRelease/Calendar

All patches are incremental and will be re-checked next week.

I think this can be landed anytime.

Comment on attachment 745856 [details] [diff] [review] beta to release Review of attachment 745856 [details] [diff] [review]: ----------------------------------------------------------------- I thought these things were supposed to be taken care of in the individual bugs, by their owners? I don't have context on most of these, so my review isn't very useful I think... ::: mozilla-tests/config.py @@ +1228,5 @@ > loadDefaultValues(BRANCHES, projectBranch, branchConfig) > loadCustomTalosSuites(BRANCHES, SUITES, projectBranch, branchConfig) > > # MERGE DAY NOTE: remove v21 based branches from the list below > +NON_UBUNTU_BRANCHES = ("mozilla-esr17", "mozilla-b2g18", "mozilla-b2g18_v1_0_1") Does this change cover uplifting mozharness unit tests (bug 843408)?

(In reply to Ben Hearsum [:bhearsum] from comment #9) > Comment on attachment 745856 [details] [diff] [review] > beta to release > > Review of attachment 745856 [details] [diff] [review]: > ----------------------------------------------------------------- > > I thought these things were supposed to be taken care of in the individual > bugs, by their owners? I don't have context on most of these, so my review > isn't very useful I think... I prepared the patch myself by expecting the dep bugs and skimming the code. It looks safer to me, easier to catch missed uplifts like https://bugzilla.mozilla.org/show_bug.cgi?id=842863#c6. > ::: mozilla-tests/config.py > @@ +1228,5 @@ > > loadDefaultValues(BRANCHES, projectBranch, branchConfig) > > loadCustomTalosSuites(BRANCHES, SUITES, projectBranch, branchConfig) > > > > # MERGE DAY NOTE: remove v21 based branches from the list below > > +NON_UBUNTU_BRANCHES = ("mozilla-esr17", "mozilla-b2g18", "mozilla-b2g18_v1_0_1") > > Does this change cover uplifting mozharness unit tests (bug 843408)? No. That will be for aurora->beta uplift (for 22.0b1).

Comment on attachment 745856 [details] [diff] [review] beta to release Review of attachment 745856 [details] [diff] [review]: ----------------------------------------------------------------- ::: mozilla-tests/config.py @@ +1211,5 @@ > > # Let's load jetpack for the following branches: > # MERGE DAY once FF21 merges into a branch remove it from this list > for branch in BRANCHES.keys(): > + if branch not in ('mozilla-esr17', 'mozilla-b2g18', 'mozilla-b2g18_v1_0_1'): Armen, any stoppers for this uplift? ::: mozilla/config.py @@ +1964,5 @@ > del BRANCHES[b]['platforms'][p] > > # MERGE DAY - pulseaudio-libs-devel package rides the trains (bug 662417) > # MERGE DAY - Remove branches as FF21 reaches them > +for b in ['mozilla-esr17', 'mozilla-b2g18', 'mozilla-b2g18_v1_0_1']: jhopkins, any stoppers here?

Comment on attachment 745856 [details] [diff] [review] beta to release Review of attachment 745856 [details] [diff] [review]: ----------------------------------------------------------------- All good from my side.

Comment on attachment 745856 [details] [diff] [review] beta to release Looks good. As Rail mentioned in IRC, Thunderbird tracks FF17 so thunderbird_config.py is not included in this patch.

Comment on attachment 745856 [details] [diff] [review] beta to release https://hg.mozilla.org/build/buildbot-configs/rev/968af0be175b

in production

Comment on attachment 747976 [details] [diff] [review] aurora to beta Review of attachment 747976 [details] [diff] [review]: ----------------------------------------------------------------- ::: mozilla-tests/config.py @@ -1169,5 @@ > BRANCHES['mozilla-beta']['platforms']['win32']['talos_slave_platforms'] = ['xp', 'win7', 'win8'] > # End MERGE DAY remove the above when Firefox 23 merges in > -# MERGE DAY remove the below when Firefox 22 merges in > -BRANCHES['mozilla-beta']['platforms']['linux']['fedora']['opt_unittest_suites'] = BUILDBOT_UNITTEST_SUITES['opt_with_ipc'][:] > -BRANCHES['mozilla-beta']['platforms']['linux']['fedora']['debug_unittest_suites'] = BUILDBOT_UNITTEST_SUITES['debug'][:] aki, per http://hg.mozilla.org/build/buildbot-configs/annotate/0300777067f5/mozilla-tests/config.py#l1171 you added this code. Are we safe to uplift the changes in this hunk? ::: mozilla-tests/mobile_config.py @@ +577,5 @@ > # MERGE DAY, drop trees from branch list as Firefox 22 rides forward. > for branch in BRANCHES.keys(): > # Loop removes it from any branch that gets beyond here > + if branch not in ('mozilla-release', 'mozilla-esr17', 'mozilla-b2g18', > + 'mozilla-b2g18_v1_0_1'): Callek, are we safe to uplift this hunk? ::: mozilla/config.py @@ +1996,1 @@ > BRANCHES[b]["run_make_alive_tests"] = False Armen, are we safe to uplift this hunk?

Comment on attachment 747982 [details] [diff] [review] central to aurora Review of attachment 747982 [details] [diff] [review]: ----------------------------------------------------------------- ::: mozilla-tests/config.py @@ -1174,5 @@ > BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin' > -# MERGE DAY remove the below when Firefox 23 merges in > -del BRANCHES['mozilla-aurora']['platforms']['win32']['win7-ix'] > -BRANCHES['mozilla-aurora']['platforms']['win32']['talos_slave_platforms'] = ['xp', 'win7', 'win8'] > -# End MERGE DAY remove the above when Firefox 23 merges in Armen, are we safe to uplift this? @@ -1355,5 @@ > > # MERGE DAY: remove branches when Firefox 23 merges in > -NON_UBUNTU_TALOS_BRANCHES = ("mozilla-aurora", "mozilla-beta", > - "mozilla-release", "mozilla-esr17", > - "mozilla-b2g18", "mozilla-b2g18_v1_0_1") r+ from me :) ::: mozilla-tests/mobile_config.py @@ +596,5 @@ > # MERGE DAY, drop trees from branch list as Firefox 23 rides forward. > for branch in BRANCHES: > # Loop removes it from any branch that gets beyond here > + if branch not in ('mozilla-beta', 'mozilla-release', 'mozilla-esr17', > + 'mozilla-b2g18', 'mozilla-b2g18_v1_0_1'): Callek, how about this uplift?

Comment on attachment 747982 [details] [diff] [review] central to aurora Review of attachment 747982 [details] [diff] [review]: ----------------------------------------------------------------- ::: mozilla-tests/config.py @@ -1174,5 @@ > BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin' > -# MERGE DAY remove the below when Firefox 23 merges in > -del BRANCHES['mozilla-aurora']['platforms']['win32']['win7-ix'] > -BRANCHES['mozilla-aurora']['platforms']['win32']['talos_slave_platforms'] = ['xp', 'win7', 'win8'] > -# End MERGE DAY remove the above when Firefox 23 merges in Can I take care of this one? I hope to have more win7 machines next week to handle more load than just Cedar but I'm not 100% if they will be ready by Monday.

(In reply to Armen Zambrano G. [:armenzg] (Release Enginerring) from comment #20) > Comment on attachment 747982 [details] [diff] [review] > central to aurora > > Review of attachment 747982 [details] [diff] [review]: > ----------------------------------------------------------------- > > ::: mozilla-tests/config.py > @@ -1174,5 @@ > > BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin' > > -# MERGE DAY remove the below when Firefox 23 merges in > > -del BRANCHES['mozilla-aurora']['platforms']['win32']['win7-ix'] > > -BRANCHES['mozilla-aurora']['platforms']['win32']['talos_slave_platforms'] = ['xp', 'win7', 'win8'] > > -# End MERGE DAY remove the above when Firefox 23 merges in > > Can I take care of this one? I hope to have more win7 machines next week to > handle more load than just Cedar but I'm not 100% if they will be ready by > Monday. Sure. I removed that hunk. Carry over r+.

Comment on attachment 747976 [details] [diff] [review] aurora to beta https://hg.mozilla.org/build/buildbot-configs/rev/dfa24ec34795

Comment on attachment 748050 [details] [diff] [review] central to aurora https://hg.mozilla.org/build/buildbot-configs/rev/fdd520dd4d89

In production

All done here.