No bug, fix api-11 references in staging release configs, which break staging build masters
authorNick Thomas <nthomas@mozilla.com>
Thu, 19 May 2016 21:45:38 +1200 (2016-05-19)
changeset 14225 f00e825ae12eaadeb9052bb2f54922dba616f8a7
parent 14224 151b97c26b65c548cc25c10ddf61c7154806f62e
child 14226 800f339e74f14077ae4a1e9ced09b89278dc060f
push id9980
push usernthomas@mozilla.com
push dateThu, 19 May 2016 09:51:34 +0000 (2016-05-19)
No bug, fix api-11 references in staging release configs, which break staging build masters
mozilla/staging_release-fennec-mozilla-release.py
mozilla/staging_release-fennec-mozilla-release.py.template
--- a/mozilla/staging_release-fennec-mozilla-release.py
+++ b/mozilla/staging_release-fennec-mozilla-release.py
@@ -61,24 +61,24 @@ releaseConfig['l10nJsonFile']        = r
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
     'users/stage-ffxbld/buildbot': 'production-0.8',
     'users/stage-ffxbld/partner-repacks': 'default',
 }
 
 # Platform configuration
-releaseConfig['enUSPlatforms']        = ('android-api-9', 'android-api-11', 'android-x86')
+releaseConfig['enUSPlatforms']        = ('android-api-9', 'android-api-15', 'android-x86')
 releaseConfig['notifyPlatforms']      = releaseConfig['enUSPlatforms']
 releaseConfig['unittestPlatforms']    = ()
 releaseConfig['talosTestPlatforms']   = ()
 releaseConfig['enableUnittests']      = False
 
 # L10n configuration
-releaseConfig['l10nPlatforms']       = ('android-api-9', 'android-api-11')
+releaseConfig['l10nPlatforms']       = ('android-api-9', 'android-api-15')
 releaseConfig['l10nNotifyPlatforms'] = releaseConfig['l10nPlatforms']
 releaseConfig['l10nChunks']          = 1
 releaseConfig['mergeLocales']        = True
 releaseConfig['enableMultiLocale']   = True
 
 # Mercurial account
 releaseConfig['hgUsername']          = 'stage-ffxbld'
 releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_rsa'
@@ -102,19 +102,20 @@ releaseConfig['partnerRepackConfig'] = {
             'config_file': 'partner_repacks/staging_release_mozilla-release_android.py',
          },
     },
 }
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
     'android-api-9': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/release',
-    'android-api-11': 'mobile/android/config/mozconfigs/android-api-11/release',
+    'android-api-15': 'mobile/android/config/mozconfigs/android-api-15/release',
     'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
 }
+releaseConfig['source_mozconfig']    = 'browser/config/mozconfigs/linux64/source'
 releaseConfig['releaseChannel']        = 'release'
 releaseConfig["updateChannels"] = {
     "release": {
         "ruleId": 35,
         "localTestChannel": "release-localtest",
         "cdnTestChannel": "release-cdntest",
         "testChannels": {
             "release-localtest": {
@@ -138,31 +139,31 @@ releaseConfig['single_locale_options'] =
     'android-api-9': [
         '--cfg',
         'single_locale/staging_release_mozilla-release_android_api_9.py',
         '--user-repo-override', 'users/stage-ffxbld',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
         '--cfg', 'single_locale/staging.py',
         '--no-taskcluster-upload',
     ],
-    'android-api-11': [
+    'android-api-15': [
         '--cfg',
-        'single_locale/staging_release_mozilla-release_android_api_11.py',
+        'single_locale/staging_release_mozilla-release_android_api_15.py',
         '--user-repo-override', 'users/stage-ffxbld',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
         '--cfg', 'single_locale/staging.py',
         '--no-taskcluster-upload',
     ],
 }
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'android-api-9':
             'multi_locale/staging_release_mozilla-release_android.json',
-        'android-api-11':
+        'android-api-15':
             'multi_locale/staging_release_mozilla-release_android.json',
         'android-x86':
             'multi_locale/staging_release_mozilla-release_android-x86.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--user-repo-override=users/stage-ffxbld',
         '--pull-locale-source',
@@ -173,17 +174,17 @@ releaseConfig['multilocale_config'] = {
 }
 
 # Staging config
 releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
 
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('android-api-9', 'android-api-11', 'android-x86', 'linux')
+releaseConfig['mock_platforms'] = ('android-api-9', 'android-api-15', 'android-x86', 'linux')
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.allizom.org'
 
 releaseConfig['tuxedoServerUrl']     = 'https://admin-bouncer.stage.mozaws.net/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-latest',
--- a/mozilla/staging_release-fennec-mozilla-release.py.template
+++ b/mozilla/staging_release-fennec-mozilla-release.py.template
@@ -61,24 +61,24 @@ releaseConfig['l10nJsonFile']        = r
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
     'users/stage-ffxbld/buildbot': 'production-0.8',
     'users/stage-ffxbld/partner-repacks': 'default',
 }
 
 # Platform configuration
-releaseConfig['enUSPlatforms']        = ('android-api-9', 'android-api-11', 'android-x86')
+releaseConfig['enUSPlatforms']        = ('android-api-9', 'android-api-15', 'android-x86')
 releaseConfig['notifyPlatforms']      = releaseConfig['enUSPlatforms']
 releaseConfig['unittestPlatforms']    = ()
 releaseConfig['talosTestPlatforms']   = ()
 releaseConfig['enableUnittests']      = False
 
 # L10n configuration
-releaseConfig['l10nPlatforms']       = ('android-api-9', 'android-api-11')
+releaseConfig['l10nPlatforms']       = ('android-api-9', 'android-api-15')
 releaseConfig['l10nNotifyPlatforms'] = releaseConfig['l10nPlatforms']
 releaseConfig['l10nChunks']          = 1
 releaseConfig['mergeLocales']        = True
 releaseConfig['enableMultiLocale']   = True
 
 # Mercurial account
 releaseConfig['hgUsername']          = 'stage-ffxbld'
 releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_rsa'
@@ -102,17 +102,17 @@ releaseConfig['partnerRepackConfig'] = {
             'config_file': 'partner_repacks/staging_release_mozilla-release_android.py',
          },
     },
 }
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
     'android-api-9': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/release',
-    'android-api-11': 'mobile/android/config/mozconfigs/android-api-11/release',
+    'android-api-15': 'mobile/android/config/mozconfigs/android-api-15/release',
     'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
 }
 releaseConfig['releaseChannel']        = 'release'
 releaseConfig["updateChannels"] = {
     "release": {
         "ruleId": 35,
         "localTestChannel": "release-localtest",
         "cdnTestChannel": "release-cdntest",
@@ -138,31 +138,31 @@ releaseConfig['single_locale_options'] =
     'android-api-9': [
         '--cfg',
         'single_locale/staging_release_mozilla-release_android_api_9.py',
         '--user-repo-override', 'users/stage-ffxbld',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
         '--cfg', 'single_locale/staging.py',
         '--no-taskcluster-upload',
     ],
-    'android-api-11': [
+    'android-api-15': [
         '--cfg',
-        'single_locale/staging_release_mozilla-release_android_api_11.py',
+        'single_locale/staging_release_mozilla-release_android_api_15.py',
         '--user-repo-override', 'users/stage-ffxbld',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
         '--cfg', 'single_locale/staging.py',
         '--no-taskcluster-upload',
     ],
 }
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'android-api-9':
             'multi_locale/staging_release_mozilla-release_android.json',
-        'android-api-11':
+        'android-api-15':
             'multi_locale/staging_release_mozilla-release_android.json',
         'android-x86':
             'multi_locale/staging_release_mozilla-release_android-x86.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--user-repo-override=users/stage-ffxbld',
         '--pull-locale-source',
@@ -173,17 +173,17 @@ releaseConfig['multilocale_config'] = {
 }
 
 # Staging config
 releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
 
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('android-api-9', 'android-api-11', 'android-x86', 'linux')
+releaseConfig['mock_platforms'] = ('android-api-9', 'android-api-15', 'android-x86', 'linux')
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.allizom.org'
 
 releaseConfig['tuxedoServerUrl']     = 'https://admin-bouncer.stage.mozaws.net/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-latest',