Bug 1278256 - drop android-api-9 from beta release templates r=Callek
authorRail Aliiev <rail@mozilla.com>
Tue, 07 Jun 2016 21:34:37 -0400
changeset 14304 c2af8456d6dda416282eb91e8679487d9f318dbe
parent 14303 8e0b583f00eeb6205a00e311b1831179bd77fd3d
child 14305 930c99e2e7ec2ce4c2865680277a92237d28244b
child 14817 2dd7d22e75dc5810a6378dd87e8784377a35a79c
push id94
push userbmo:rail@mozilla.com
push dateWed, 08 Jun 2016 01:34:44 +0000
reviewersCallek
bugs1278256
Bug 1278256 - drop android-api-9 from beta release templates r=Callek MozReview-Commit-ID: 8awyruaAcvS
mozilla/release-fennec-mozilla-beta.py.template
mozilla/staging_release-fennec-mozilla-beta.py.template
--- a/mozilla/release-fennec-mozilla-beta.py.template
+++ b/mozilla/release-fennec-mozilla-beta.py.template
@@ -59,24 +59,24 @@ releaseConfig['l10nRevisionFile']    = '
 releaseConfig['l10nJsonFile']        = releaseConfig['l10nRevisionFile']
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_AUTOMATION',
     'build/buildbot': 'production-0.8',
 }
 
 # Platform configuration
-releaseConfig['enUSPlatforms']        = ('android-api-9', 'android-api-15', 'android-x86')
+releaseConfig['enUSPlatforms']        = ('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-15')
+releaseConfig['l10nPlatforms']       = ('android-api-15',)
 releaseConfig['l10nNotifyPlatforms'] = releaseConfig['l10nPlatforms']
 releaseConfig['mergeLocales']        = True
 releaseConfig['enableMultiLocale']   = True
 
 # Mercurial account
 releaseConfig['hgUsername']          = 'ffxbld'
 releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_rsa'
 
@@ -89,17 +89,16 @@ releaseConfig['ausServerUrl']        = '
 
 # Partner repack configuration
 releaseConfig['doPartnerRepacks']       = False
 releaseConfig['partnersRepoPath']       = 'build/partner-repacks'
 releaseConfig['partnerRepackPlatforms'] = ()
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
-    'android-api-9': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/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']      = 'beta'
 releaseConfig["updateChannels"] = {
     "beta": {
         "ruleId": 91,
@@ -119,53 +118,44 @@ releaseConfig["updateChannels"] = {
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
-    'android-api-9': [
-        '--cfg',
-        'single_locale/release_mozilla-beta_android_api_9.py',
-        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
-        '--cfg', 'single_locale/production.py',
-        '--no-taskcluster-upload',
-    ],
     'android-api-15': [
         '--cfg',
         'single_locale/release_mozilla-beta_android_api_15.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
         '--cfg', 'single_locale/production.py',
         '--no-taskcluster-upload',
     ],
 }
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
-        'android-api-9':
-            'multi_locale/release_mozilla-beta_android.json',
         'android-api-15':
             'multi_locale/release_mozilla-beta_android.json',
         'android-x86':
             'multi_locale/release_mozilla-beta_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['use_mock'] = True
-releaseConfig['mock_platforms'] = ('android-api-9', 'android-api-15', 'android-x86', 'linux')
+releaseConfig['mock_platforms'] = ('android-api-15', 'android-x86', 'linux')
 releaseConfig['enableAutomaticPushToMirrors'] = True
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 # Tuxedo/Bouncer configuration
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
--- a/mozilla/staging_release-fennec-mozilla-beta.py.template
+++ b/mozilla/staging_release-fennec-mozilla-beta.py.template
@@ -61,24 +61,24 @@ releaseConfig['l10nRevisionFile']    = '
 releaseConfig['l10nJsonFile']        = releaseConfig['l10nRevisionFile']
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
     'users/stage-ffxbld/buildbot': 'production-0.8',
 }
 
 # Platform configuration
-releaseConfig['enUSPlatforms']        = ('android-api-9', 'android-api-15', 'android-x86')
+releaseConfig['enUSPlatforms']        = ('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-15')
+releaseConfig['l10nPlatforms']       = ('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'
@@ -92,17 +92,16 @@ releaseConfig['ausServerUrl']        = '
 
 # Partner repack configuration
 releaseConfig['doPartnerRepacks']       = False
 releaseConfig['partnersRepoPath']       = 'users/stage-ffxbld/partner-repacks'
 releaseConfig['partnerRepackPlatforms'] = ()
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
-    'android-api-9': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/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']      = 'beta'
 releaseConfig["updateChannels"] = {
     "beta": {
         "ruleId": 34,
@@ -122,38 +121,28 @@ releaseConfig["updateChannels"] = {
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
-    'android-api-9': [
-        '--cfg',
-        'single_locale/staging_release_mozilla-beta_android_api_9.py',
-        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
-        '--user-repo-override', 'users/stage-ffxbld',
-        '--cfg', 'single_locale/staging.py',
-        '--no-taskcluster-upload',
-    ],
     'android-api-15': [
         '--cfg',
         'single_locale/staging_release_mozilla-beta_android_api_15.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
         '--user-repo-override', 'users/stage-ffxbld',
         '--cfg', 'single_locale/staging.py',
         '--no-taskcluster-upload',
     ],
 }
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
-        'android-api-9':
-            'multi_locale/staging_release_mozilla-beta_android.json',
         'android-api-15':
             'multi_locale/staging_release_mozilla-beta_android.json',
         'android-x86':
             'multi_locale/staging_release_mozilla-beta_android-x86.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--user-repo-override=users/stage-ffxbld',
@@ -164,17 +153,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-15', 'android-x86', 'linux')
+releaseConfig['mock_platforms'] = ('android-api-15', 'android-x86', 'linux')
 releaseConfig['enableAutomaticPushToMirrors'] = True
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 # Tuxedo/Bouncer configuration
 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'] = {