Bug 1119237 - tracking bug for build and release of Firefox and Fennec 37.0, r=rail
authorJordan Lund <jlund@mozilla.com>
Mon, 23 Mar 2015 12:44:17 -0700
changeset 11839 11791d4a43844f52f2d317b1bbaa91cf0104169b
parent 11838 f214144941b09b581c9be578621c023b1cc8870c
child 11840 b134a9dd73c1614567b15c94af3bfc600dca0137
child 12989 cc32510474d3e77a68ea098bffb1b3515c99f7ba
push id3
push userahalberstadt@mozilla.com
push dateWed, 29 Apr 2015 14:58:39 +0000
reviewersrail
bugs1119237
Bug 1119237 - tracking bug for build and release of Firefox and Fennec 37.0, r=rail
mozilla/release-fennec-mozilla-release.py
--- a/mozilla/release-fennec-mozilla-release.py
+++ b/mozilla/release-fennec-mozilla-release.py
@@ -61,24 +61,24 @@ releaseConfig['l10nJsonFile']        = r
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_AUTOMATION',
     'build/buildbot': 'production-0.8',
     'build/partner-repacks': 'default',
     'build/mozharness': 'production',
 }
 
 # Platform configuration
-releaseConfig['enUSPlatforms']        = ('android', 'android-x86')
+releaseConfig['enUSPlatforms']        = ('android-api-9', 'android-api-11', 'android-x86')
 releaseConfig['notifyPlatforms']      = releaseConfig['enUSPlatforms']
 releaseConfig['unittestPlatforms']    = ()
 releaseConfig['talosTestPlatforms']   = ()
 releaseConfig['enableUnittests']      = False
 
 # L10n configuration
-releaseConfig['l10nPlatforms']       = ('android',)
+releaseConfig['l10nPlatforms']       = ('android-api-9', 'android-api-11')
 releaseConfig['l10nNotifyPlatforms'] = releaseConfig['l10nPlatforms']
 releaseConfig['mergeLocales']        = True
 releaseConfig['enableMultiLocale']   = True
 
 # Mercurial account
 releaseConfig['hgUsername']          = 'ffxbld'
 releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_rsa'
 
@@ -101,17 +101,18 @@ releaseConfig['partnerRepackConfig'] = {
             'script': 'scripts/mobile_partner_repack.py',
             'config_file': 'partner_repacks/release_mozilla-release_android.py',
          },
     },
 }
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
-    'android': 'mobile/android/config/mozconfigs/android/release',
+    '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-x86': 'mobile/android/config/mozconfigs/android-x86/release',
 }
 releaseConfig['releaseChannel']        = 'release'
 releaseConfig["updateChannels"] = {
     "release": {
         "ruleId": -1, # TBD
         "localTestChannel": "release-localtest",
         "cdnTestChannel": "release-cdntest",
@@ -138,46 +139,53 @@ releaseConfig["svnSshKey"]          = "/
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
-    'android': [
+    'android-api-9': [
         '--cfg',
-        'single_locale/release_mozilla-release_android.py',
+        'single_locale/release_mozilla-release_android_api_9.py',
+        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
+    ],
+    'android-api-11': [
+        '--cfg',
+        'single_locale/release_mozilla-release_android_api_11.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
     ],
 }
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
-        'android':
+        'android-api-9':
+            'multi_locale/release_mozilla-release_android.json',
+        'android-api-11':
             'multi_locale/release_mozilla-release_android.json',
         'android-x86':
             'multi_locale/release_mozilla-release_android-x86.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--pull-locale-source',
         '--add-locales',
         '--package-multi',
         '--summary',
     ]
 }
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
+releaseConfig['mock_platforms'] = ('android-api-9', 'android-api-11', 'android-x86', 'linux')
 releaseConfig['ftpSymlinkName'] = 'latest'
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-latest',
 }
-releaseConfig['skip_updates']        = True
\ No newline at end of file
+releaseConfig['skip_updates']        = True