bug 1125924: add hack to make partial generation work for first few versions of win64 release. r=rail
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 06 Feb 2015 11:45:08 -0500 (2015-02-06)
changeset 11773 c94767c584a65391071b6b6e303d44e6bdbc89ae
parent 11772 62928117cb7216b25801ce6b9574628608355a6c
child 11774 ce46ace2864eebd54360830c599347e721567701
push id8561
push userbhearsum@mozilla.com
push dateFri, 06 Feb 2015 16:45:17 +0000 (2015-02-06)
reviewersrail
bugs1125924
bug 1125924: add hack to make partial generation work for first few versions of win64 release. r=rail
mozilla/release-firefox-mozilla-beta.py.template
mozilla/release-firefox-mozilla-release.py.template
mozilla/staging_release-firefox-mozilla-beta.py.template
mozilla/staging_release-firefox-mozilla-release.py.template
--- a/mozilla/release-firefox-mozilla-beta.py.template
+++ b/mozilla/release-firefox-mozilla-beta.py.template
@@ -32,16 +32,19 @@ releaseConfig['partialUpdates']      = {
 {% for version, partial in partials.items() %}
     '{{ version }}': {
         'appVersion': '{{ partial['appVersion'] }}',
         'buildNumber': {{ partial['buildNumber'] }},
         'baseTag': '{{ partial['baseTag'] }}',
     },
 {% endfor %}
 }
+# win64 support
+releaseConfig['HACK_first_released_version'] = {'win64': '37.0b1'}
+
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'mozilla': {
         'name': 'mozilla-beta',
         'path': '{{ branch }}',
@@ -67,16 +70,17 @@ releaseConfig['l10nRevisionFile']    = '
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_AUTOMATION',
     'build/buildbot': 'production-0.8',
     'build/partner-repacks': 'default',
     'build/mozharness': 'production',
 }
 
 # Platform configuration
+# TODO: add win64 before 37.0b1
 releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
 releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
 releaseConfig['talosTestPlatforms']  = ()
 releaseConfig['xulrunnerPlatforms']  = releaseConfig['enUSPlatforms']
 
 # Unittests
 releaseConfig['unittestPlatforms']   = ()
 releaseConfig['enableUnittests']     = False
@@ -103,29 +107,32 @@ releaseConfig['ausSshKey']           = '
 releaseConfig['releaseNotesUrl']     = None
 releaseConfig['testOlderPartials']   = False
 releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
 releaseConfig['updateVerifyChunks']  = 6
 releaseConfig['verifyConfigs']       = {
     'linux':  'mozBeta-firefox-linux.cfg',
     'linux64':  'mozBeta-firefox-linux64.cfg',
     'macosx64': 'mozBeta-firefox-mac64.cfg',
-    'win32':  'mozBeta-firefox-win32.cfg'
+    'win32':  'mozBeta-firefox-win32.cfg',
+    #'win64':  'mozBeta-firefox-win64.cfg',
 }
 releaseConfig['mozconfigs']          = {
     'linux': 'browser/config/mozconfigs/linux32/beta',
     'linux64': 'browser/config/mozconfigs/linux64/beta',
     'macosx64': 'browser/config/mozconfigs/macosx-universal/beta',
     'win32': 'browser/config/mozconfigs/win32/beta',
+    #'win64': 'browser/config/mozconfigs/win64/beta',
 }
 releaseConfig['xulrunner_mozconfigs']          = {
     'linux': 'xulrunner/config/mozconfigs/linux32/xulrunner',
     'linux64': 'xulrunner/config/mozconfigs/linux64/xulrunner',
     'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
     'win32': 'xulrunner/config/mozconfigs/win32/xulrunner',
+    #'win64': 'xulrunner/config/mozconfigs/win64/xulrunner',
 }
 releaseConfig['releaseChannel']        = 'beta'
 releaseConfig['releaseChannelRuleIds'] = [32]
 releaseConfig['localTestChannel']      = 'beta-localtest'
 releaseConfig['cdnTestChannel']        = 'beta-cdntest'
 releaseConfig['testChannelRuleIds']    = [25,45]
 
 # Partner repack configuration
--- a/mozilla/release-firefox-mozilla-release.py.template
+++ b/mozilla/release-firefox-mozilla-release.py.template
@@ -34,16 +34,19 @@ releaseConfig['partialUpdates']      = {
         'appVersion': '{{ partial['appVersion'] }}',
         'buildNumber': {{ partial['buildNumber'] }},
         'baseTag': '{{ partial['baseTag'] }}',
     },
 {% endfor %}
 }
 releaseConfig['extraPartials']       = {
 }
+# TODO: set this properly when we start shipping win64 on release
+#releaseConfig['HACK_first_released_version'] = {'win64': TBD}
+
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'mozilla': {
         'name': 'mozilla-release',
         'path': '{{ branch }}',
@@ -69,16 +72,17 @@ releaseConfig['l10nRevisionFile']    = '
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_AUTOMATION',
     'build/buildbot': 'production-0.8',
     'build/partner-repacks': 'default',
     'build/mozharness': 'production',
 }
 
 # Platform configuration
+# TODO: add win64 when we're ready to ship it
 releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
 releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
 releaseConfig['talosTestPlatforms']  = ()
 releaseConfig['xulrunnerPlatforms']  = releaseConfig['enUSPlatforms']
 
 # Unittests
 releaseConfig['unittestPlatforms']   = ()
 releaseConfig['enableUnittests']     = False
@@ -105,29 +109,32 @@ releaseConfig['ausSshKey']           = '
 releaseConfig['releaseNotesUrl']     = None
 releaseConfig['testOlderPartials']   = False
 releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
 releaseConfig['updateVerifyChunks']  = 6
 releaseConfig['verifyConfigs']       = {
     'linux':  'mozRelease-firefox-linux.cfg',
     'linux64':  'mozRelease-firefox-linux64.cfg',
     'macosx64': 'mozRelease-firefox-mac64.cfg',
-    'win32':  'mozRelease-firefox-win32.cfg'
+    'win32':  'mozRelease-firefox-win32.cfg',
+    #'win64':  'mozRelease-firefox-win64.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',
+    #'win64': 'browser/config/mozconfigs/win64/release',
 }
 releaseConfig['xulrunner_mozconfigs']          = {
     'linux': 'xulrunner/config/mozconfigs/linux32/xulrunner',
     'linux64': 'xulrunner/config/mozconfigs/linux64/xulrunner',
     'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
     'win32': 'xulrunner/config/mozconfigs/win32/xulrunner',
+    #'win64': 'xulrunner/config/mozconfigs/win64/xulrunner',
 }
 releaseConfig['releaseChannel']        = 'release'
 releaseConfig['releaseChannelRuleIds'] = [33]
 releaseConfig['localTestChannel']      = 'release-localtest'
 releaseConfig['cdnTestChannel']        = 'release-cdntest'
 releaseConfig['testChannelRuleIds']    = [56,57]
 
 # Partner repack configuration
--- a/mozilla/staging_release-firefox-mozilla-beta.py.template
+++ b/mozilla/staging_release-firefox-mozilla-beta.py.template
@@ -33,16 +33,19 @@ releaseConfig['partialUpdates']      = {
 {% for version, partial in partials.items() %}
     '{{ version }}': {
         'appVersion': '{{ partial['appVersion'] }}',
         'buildNumber': {{ partial['buildNumber'] }},
         'baseTag': '{{ partial['baseTag'] }}',
     },
 {% endfor %}
 }
+# win64 support
+releaseConfig['HACK_first_released_version'] = {'win64': '37.0b1'}
+
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 ## Staging repository path
 releaseConfig['userRepoRoot'] = 'users/stage-ffxbld'
 releaseConfig['sourceRepositories']  = {
     'mozilla': {
@@ -71,17 +74,17 @@ releaseConfig['l10nRevisionFile']    = '
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
     'users/stage-ffxbld/buildbot': 'production-0.8',
     'users/stage-ffxbld/mozharness': 'production',
 }
 
 # Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64', 'win64')
 releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
 releaseConfig['talosTestPlatforms']  = ()
 releaseConfig['xulrunnerPlatforms']  = releaseConfig['enUSPlatforms']
 
 # Unittests
 releaseConfig['unittestPlatforms']   = ()
 releaseConfig['enableUnittests']     = False
 
@@ -109,29 +112,32 @@ releaseConfig['ausSshKey']           = '
 releaseConfig['releaseNotesUrl']     = None
 releaseConfig['testOlderPartials']   = False
 releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
 releaseConfig['updateVerifyChunks']  = 6
 releaseConfig['verifyConfigs']       = {
     'linux':  'mozBeta-firefox-linux.cfg',
     'linux64':  'mozBeta-firefox-linux64.cfg',
     'macosx64': 'mozBeta-firefox-mac64.cfg',
-    'win32':  'mozBeta-firefox-win32.cfg'
+    'win32':  'mozBeta-firefox-win32.cfg',
+    'win64':  'mozBeta-firefox-win64.cfg',
 }
 releaseConfig['mozconfigs']          = {
     'linux': 'browser/config/mozconfigs/linux32/beta',
     'linux64': 'browser/config/mozconfigs/linux64/beta',
     'macosx64': 'browser/config/mozconfigs/macosx-universal/beta',
     'win32': 'browser/config/mozconfigs/win32/beta',
+    'win64': 'browser/config/mozconfigs/win64/beta',
 }
 releaseConfig['xulrunner_mozconfigs']          = {
     'linux': 'xulrunner/config/mozconfigs/linux32/xulrunner',
     'linux64': 'xulrunner/config/mozconfigs/linux64/xulrunner',
     'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
     'win32': 'xulrunner/config/mozconfigs/win32/xulrunner',
+    'win64': 'xulrunner/config/mozconfigs/win64/xulrunner',
 }
 releaseConfig['releaseChannel']        = 'beta'
 releaseConfig['releaseChannelRuleIds'] = [26]
 releaseConfig['localTestChannel']      = 'beta-localtest'
 releaseConfig['cdnTestChannel']        = 'beta-cdntest'
 releaseConfig['testChannelRuleIds']    = [40,41]
 
 # Partner repack configuration
--- a/mozilla/staging_release-firefox-mozilla-release.py.template
+++ b/mozilla/staging_release-firefox-mozilla-release.py.template
@@ -33,16 +33,19 @@ releaseConfig['partialUpdates']      = {
 {% for version, partial in partials.items() %}
     '{{ version }}': {
         'appVersion': '{{ partial['appVersion'] }}',
         'buildNumber': {{ partial['buildNumber'] }},
         'baseTag': '{{ partial['baseTag'] }}',
     },
 {% endfor %}
 }
+# win64 support
+#releaseConfig['HACK_first_released_version'] = {'win64': TBD}
+
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 ## Staging repository path
 releaseConfig['userRepoRoot'] = 'users/stage-ffxbld'
 releaseConfig['sourceRepositories']  = {
     'mozilla': {
@@ -72,18 +75,19 @@ releaseConfig['l10nRevisionFile']    = '
 releaseConfig['otherReposToTag']     = {
     'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
     'users/stage-ffxbld/buildbot': 'production-0.8',
     'users/stage-ffxbld/partner-repacks': 'default',
     'users/stage-ffxbld/mozharness': 'production',
 }
 
 # Platform configuration
+# TODO: add win64 when we're ready to ship it
 releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['notifyPlatforms']     = releaseConfig["enUSPlatform"]
 releaseConfig['talosTestPlatforms']  = ()
 releaseConfig['xulrunnerPlatforms']  = releaseConfig['enUSPlatforms']
 
 # Unittests
 releaseConfig['unittestPlatforms']   = ()
 releaseConfig['enableUnittests']     = False
 
 # L10n configuration
@@ -109,29 +113,32 @@ releaseConfig['ausUser']             = '
 releaseConfig['ausSshKey']           = 'ffxbld_rsa'
 releaseConfig['releaseNotesUrl']     = None
 releaseConfig['testOlderPartials']   = False
 releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
 releaseConfig['verifyConfigs']       = {
     'linux':  'mozRelease-firefox-linux.cfg',
     'linux64':  'mozRelease-firefox-linux64.cfg',
     'macosx64': 'mozRelease-firefox-mac64.cfg',
-    'win32':  'mozRelease-firefox-win32.cfg'
+    'win32':  'mozRelease-firefox-win32.cfg',
+    #'win64':  'mozRelease-firefox-win64.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',
+    #'win64': 'browser/config/mozconfigs/win64/release',
 }
 releaseConfig['xulrunner_mozconfigs']          = {
     'linux': 'xulrunner/config/mozconfigs/linux32/release',
     'linux64': 'xulrunner/config/mozconfigs/linux64/release',
     'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/release',
     'win32': 'xulrunner/config/mozconfigs/win32/release',
+    #'win64': 'xulrunner/config/mozconfigs/win64/release',
 }
 releaseConfig['releaseChannel']        = 'release'
 releaseConfig['releaseChannelRuleIds'] = [31]
 releaseConfig['localTestChannel']      = 'release-localtest'
 releaseConfig['cdnTestChannel']        = 'release-cdntest'
 releaseConfig['testChannelRuleIds']    = [19,20]
 
 # Partner repack configuration