Bug 1043349 - tracking bug for build and release of Firefox 31.1.0 ESR. r=bhearsum
authorRail Aliiev <rail@mozilla.com>
Thu, 24 Jul 2014 11:02:30 -0400
changeset 10751 0a0d50670456c8e4fa16b28349968baa8ce0d8ba
parent 10749 9979e6f6f25f7c42997d19eb6630ae459d0e9bbc
child 10752 81f88e05f710fd2a1073df9e868c749c0da49ce6
push id7925
push userraliiev@mozilla.com
push dateThu, 24 Jul 2014 15:03:11 +0000
reviewersbhearsum
bugs1043349
Bug 1043349 - tracking bug for build and release of Firefox 31.1.0 ESR. r=bhearsum
mozilla/release-firefox-mozilla-esr31.py.template
--- a/mozilla/release-firefox-mozilla-esr31.py.template
+++ b/mozilla/release-firefox-mozilla-esr31.py.template
@@ -1,24 +1,15 @@
 # ATTENTION:
 # If you are editing the non-template version of this file (eg, doesn't end
 # with .template), your change WILL get overwritten. If you're adding, removing,
 # or changing options as part of release automation changes you should be
 # editing the .template instead. This file should only by edited directly if
 # you're starting a release without Release Kickoff. You have been warned.
 releaseConfig = {}
-# HACK ALERT
-# TODO for 31.0.1esr: the following line should be removed for 31.0.1esr build
-# to enable updates
-#####################################
-
-releaseConfig['skip_updates'] = True
-
-#####################################
-# END OF HACK ALERT
 
 releaseConfig['disable_tinderbox_mail'] = True
 releaseConfig['base_clobber_url'] = 'http://clobberer.pvt.build.mozilla.org/always_clobber.php'
 
 # Release Notification
 releaseConfig['AllRecipients']       = ['<release@mozilla.com>',
                                         '<release-mgmt@mozilla.com>',
                                         '<qa-drivers@mozilla.com>']
@@ -32,17 +23,25 @@ releaseConfig['messagePrefix']       = '
 releaseConfig['productName']         = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
-releaseConfig['partialUpdates']      = {}
+releaseConfig['partialUpdates']      = {
+{% for version, partial in partials.items() %}
+    '{{ version }}': {
+        'appVersion': '{{ partial['appVersion'] }}',
+        'buildNumber': {{ partial['buildNumber'] }},
+        'baseTag': '{{ partial['baseTag'] }}',
+    },
+{% endfor %}
+}
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = '{{ version }}pre'
 releaseConfig['nextMilestone']       = releaseConfig['nextAppVersion']
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'mozilla': {
         'name': 'mozilla-esr31',
         'path': '{{ branch }}',
@@ -101,17 +100,22 @@ releaseConfig['ausServerUrl']        = '
 releaseConfig['ausHost']             = 'aus3-staging.mozilla.org'
 releaseConfig['ausUser']             = 'ffxbld'
 releaseConfig['ausSshKey']           = 'ffxbld_dsa'
 releaseConfig['releaseNotesUrl']     = None
 releaseConfig['testOlderPartials']   = False
 releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
 releaseConfig['useBetaChannel']      = 1
 releaseConfig['updateVerifyChunks']  = 6
-releaseConfig['verifyConfigs']       = {} # TODO for 31.0.1esr
+releaseConfig['verifyConfigs']       = {
+    'linux':  'mozEsr31-firefox-linux.cfg',
+    'linux64':  'mozEsr31-firefox-linux64.cfg',
+    'macosx64': 'mozEsr31-firefox-mac64.cfg',
+    'win32':  'mozEsr31-firefox-win32.cfg'
+}
 releaseConfig['mozconfigs']          = {
     'linux': 'browser/config/mozconfigs/linux32/release',
     'linux64': 'browser/config/mozconfigs/linux64/release',
     'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
     'win32': 'browser/config/mozconfigs/win32/release',
 }
 releaseConfig['releaseChannel']        = 'esr'
 releaseConfig['releaseChannelRuleIds'] = [] # Still on AUS3