Backed out changeset 5cc0b4940fa6
authorJohan Lorenzo <jlorenzo@mozilla.com>
Sun, 03 Sep 2017 10:51:46 +0200
changeset 15416 e9791ae08db0f65683f1df4748df07a21162fc5b
parent 15415 5cc0b4940fa60d352e4b7a14fb691572b939b901
child 15417 bb907e190ce73cd49ceab55f89f19ee6fa577118
push id190
push usersfraser@mozilla.com
push dateThu, 14 Sep 2017 10:23:41 +0000
backs out5cc0b4940fa60d352e4b7a14fb691572b939b901
Backed out changeset 5cc0b4940fa6 MozReview-Commit-ID: BKdW7mAO021
mozilla/config.py
mozilla/project_branches.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -71,20 +71,19 @@ GLOBAL_VARS = {
         'linux64-debug': {},
         'linux64-asan': {},
         'linux64-asan-debug': {},
         'linux64-av': {},
         'linux64-devedition': {},
         'macosx64-debug': {},
         'win32-debug': {},
         'win64-debug': {},
-        # TODO Bug 1389420. Delete api-15 once Firefox 56 reaches release
         'android-api-15': {},
+        'android-x86': {},
         'android-api-15-debug': {},
-        'android-x86': {},
     },
     'pgo_strategy': None,
     'pgo_platforms': ('linux', 'win32', 'win64',),
     'periodic_start_hours': range(0, 24, 6),
     'enable_blocklist_update': False,
     'enable_hsts_update': False,
     'enable_hpkp_update': False,
     'file_update_on_closed_tree': False,
@@ -2315,20 +2314,17 @@ BRANCHES['mozilla-beta']['localesURL'] =
 BRANCHES['mozilla-beta']['enable_multi_locale'] = True
 BRANCHES['mozilla-beta']['upload_mobile_symbols'] = True
 # temp disable nightlies (which includes turning off enable_l10n and l10nNightlyUpdate)
 BRANCHES['mozilla-beta']['enable_nightly'] = False
 # If True, a complete update snippet for this branch will be generated and
 # uploaded to. Any platforms with 'debug' in them will not have snippets
 # generated.
 BRANCHES['mozilla-beta']['enable_blocklist_update'] = True
-# TODO Bug 1389420. Delete api-15 once Firefox 56 reaches release
 BRANCHES['mozilla-beta']['platforms']['android-api-15']['enable_dep'] = True
-BRANCHES['mozilla-beta']['platforms']['android-api-16'] = {}
-BRANCHES['mozilla-beta']['platforms']['android-api-16']['enable_dep'] = True
 BRANCHES['mozilla-beta']['platforms']['android-api-15-debug']['enable_dep'] = True
 BRANCHES['mozilla-beta']['enabled_products'] = ['firefox', 'mobile', 'devedition']
 BRANCHES['mozilla-beta']['enable_perproduct_builds'] = False
 ### Release Promotion
 # enables/disables BB builders
 BRANCHES['mozilla-beta']['enable_release_promotion'] = {
     "firefox": True,
     "fennec": True,
@@ -2408,17 +2404,17 @@ BRANCHES['mozilla-beta']['release_channe
 }
 BRANCHES['mozilla-beta']['beetmover_buckets'] = {
     "firefox": "net-mozaws-prod-delivery-firefox",
     "fennec": "net-mozaws-prod-delivery-archive",
     "devedition": "net-mozaws-prod-delivery-archive",
 }
 BRANCHES['mozilla-beta']['uptake_monitoring_platforms'] = {
     "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
-    "fennec": ("android-api-16", "android-x86"),
+    "fennec": ("android-api-15", "android-x86"),
     "devedition": ("linux", "linux64", "win32", "win64", "macosx64"),
 }
 BRANCHES['mozilla-beta']['signing_class'] = {
     "firefox": "release-signing",
     "fennec": "release-signing",
     "devedition": "nightly-signing",
 }
 BRANCHES['mozilla-beta']['signing_cert'] = {
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -182,17 +182,17 @@ PROJECT_BRANCHES = {
             "devedition": "dev-mozilla-beta_devedition",
         },
         'release_channel_mappings': {
             "firefox": [["^.*$", ["beta-dev"]]],
             "devedition": [["^.*$", ["aurora-dev"]]],
         },
         'uptake_monitoring_platforms': {
             "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
-            "fennec": ("android-api-16", "android-x86"),
+            "fennec": ("android-api-15", "android-api-16", "android-x86"),
             "devedition": ("linux", "linux64", "win32", "win64", "macosx64"),
         },
         # temp balrog
         'balrog_api_root': 'http://ec2-54-159-98-221.compute-1.amazonaws.com:8080/api',
         'funsize_balrog_api_root': 'http://ec2-54-159-98-221.compute-1.amazonaws.com:8080/api',
         'tuxedoServerUrl': 'https://admin-bouncer.stage.mozaws.net/api',
         'bouncer_submitter_config': {
             "firefox": "releases/bouncer_firefox_beta.py",