+++ This bug was initially created as a clone of Bug #913195 +++ Like bug 913195 and bug 796995, but for esr31 this cycle.

tools changes for esr31

buildbot-configs changes for esr31

Comment on attachment 8448431 [details] [diff] [review] tools-esr31.patch >diff --git a/buildbot-helpers/mozconfig_whitelist b/buildbot-helpers/mozconfig_whitelist I'm not sure if this will work or not, have you tested ? I'll r+ for the rest and ask you check it out. There's reasonable chance that copying the whitelist from esr24 will have missed changes on release in the meantime. We have this funny mismash of release sanity checks, and the in-tree mozconfigs and whitelist (see browser/config/mozconfigs/whitelist, which we verify each time 'make check' is run on a dep build). >diff --git a/scripts/preproduction/repo_setup_config.py b/scripts/preproduction/repo_setup_config.py Don't worry about this one, preproduction is deader than a dead thing.

Comment on attachment 8448432 [details] [diff] [review] buildbot-configs-esr31.patch Nearly there, but needs a few minor fixes. >diff --git a/mozilla-tests/config.py b/mozilla-tests/config.py >+BRANCHES['mozilla-esr31']['xperf_tests'] = (0, False, TALOS_TP_NEW_OPTS, WIN7_ONLY) Strongly suspect this was set for esr24 because xperf wasn't supported on 24. We do have it enabled on beta so lets remove this line. >diff --git a/mozilla/config.py b/mozilla/config.py >+ 'mozilla-esr31': { >+ 'branch_projects': [], >+ 'lock_platforms': True, >+ 'gecko_version': 31, >+ 'platforms': { >+ 'linux': {}, >+ 'linux64': {}, ... We may need android-armv6 here too. Check with coop on the status of dropping Android 2.2 support. >diff --git a/mozilla/master_common.py b/mozilla/master_common.py > BRANCH_PRIORITIES = { > 'mozilla-release': 0, > 'comm-esr24': 0, >+ 'comm-esr31': 0, > 'mozilla-esr24': 1, Please change this to mozilla-esr31. >diff --git a/mozilla/preproduction_config.py b/mozilla/preproduction_config.py >diff --git a/mozilla/preproduction_release_overrides-esr31.py b/mozilla/preproduction_release_overrides-esr31.py Can leave both of these out, the parrot is dead. [http://www.youtube.com/watch?v=npjOSLCR2hE] >diff --git a/mozilla/staging_release-firefox-mozilla-esr24.py b/mozilla/staging_release-firefox-mozilla-esr31.py Needs the js/src/config/milestone.txt removal from bumpFiles; the template does too. Might find some other things if you diff against the template. >diff --git a/mozilla/staging_release-firefox-mozilla-esr24.py b/mozilla/staging_release-firefox-mozilla-esr31.py.template >similarity index 77% >copy from mozilla/staging_release-firefox-mozilla-esr24.py >copy to mozilla/staging_release-firefox-mozilla-esr31.py.template Ooof, did this one the hard way ;-) >diff --git a/setup-master.py b/setup-master.py > [('staging_release-thunderbird-comm-%s.py' % v, > 'release-thunderbird-comm-%s.py' % v) >- for v in ['beta', 'release', 'esr24'] >+ for v in ['beta', 'release', 'esr24', 'esr31'] This will likely break test-masters.sh, as the release configs aren't being added by the patch. It's fine to leave comm-esr31 to other patches.

Thanks for the review, nthomas. Here's an updated version of the patch

added mozilla/release-firefox-mozilla-esr31.py, added releaseConfig['skip_updates'] = True in mozilla/release-firefox-mozilla-esr31.py.template

Merged to production, and deployed.

Added mozilla2/linux/mozilla-esr31/release/mozconfig as a copy of esr24

Comment on attachment 8452404 [details] [diff] [review] [buildbot-configs] Bug 1012647 - add mozconfig for esr31.patch stamp

updated mozconfig_whitelist file needed by the esr31 staging release

this patches removes the partialUpdates because the first esr31 has none. The skip_update is at the top with a hug HACK ALERT and must be removed after this release

Merged to production, and deployed.

So is this branch already up-to-date or do we still have to push the latest state from the mozilla-release branch (from after todays merge) to it?

I pulled new changes from mozilla-release after the merge push and applied this patch on top of default to update the branding: http://hg.mozilla.org/releases/mozilla-esr31/rev/450086c0ded0

Looks like we need the equivalent patch to http://hg.mozilla.org/releases/mozilla-release/diff/d33428174ff1/browser/confvars.sh

Comment on attachment 8455644 [details] [diff] [review] update channel https://hg.mozilla.org/releases/mozilla-esr31/rev/e91c79c4c04b