Bug 1384482 - Keep using android-api-15 config r=mtabara
authorJohan Lorenzo <jlorenzo@mozilla.com>
Wed, 06 Sep 2017 18:09:49 +0200 (2017-09-06)
changeset 5212 b2fbd21e6e01a80f3dc1da721426d189cb4d60d8
parent 5210 d776128563075560e9b1b4e640948b24c4f35618
child 5213 adcd1513809c791003f8b4d9c484f3e53710233b
child 5214 ca9814bb3b71d0d4fb0208bf63cd7202caf1c2b4
push id4417
push userjlorenzo@mozilla.com
push dateWed, 06 Sep 2017 16:27:38 +0000 (2017-09-06)
reviewersmtabara
bugs1384482
Bug 1384482 - Keep using android-api-15 config r=mtabara Builders don't have to know about an API change. android-api-15 is just used to name and identify api-agnostic machines MozReview-Commit-ID: 5PRH3l7DhgD
process/release.py
--- a/process/release.py
+++ b/process/release.py
@@ -2179,31 +2179,29 @@ def generateReleasePromotionBuilders(bra
     # Don't merge release builder requests
     nomergeBuilders.update([b['name'] for b in builders])
 
     # Make sure builders have the right properties
     addBuilderProperties(builders)
 
     return builders
 
-# TODO: Add mozilla-beta.
-# TODO: Add mozilla-release once Fennec 56 reaches release
-BRANCHES_WITH_API_LEVEL_16 = ('jamun',)
-
 
 def generateFennecReleasePromotionBuilders(branch_config, branch_name, product,
                                            secrets):
     builders = []
     category_name = "release-%s" % branch_name
     tools_repo_path = branch_config.get('build_tools_repo_path')
     tools_repo = '%s%s' % (branch_config['hgurl'], tools_repo_path)
 
-    api_level = 'api-16' if branch_name in BRANCHES_WITH_API_LEVEL_16 else 'api-15'
-    arm_platform = 'android-%s' % api_level
-    arm_platform_config = branch_config['platforms'][arm_platform]
+    # In release promotion, the API level is just used to name and identify API-agnostic
+    # machines. Thus, there is no need to upgrade/define a new config for higher APIs.
+    # For more details, see https://bugzilla.mozilla.org/show_bug.cgi?id=1384482#c85
+    # and following comments.
+    arm_platform_config = branch_config['platforms']['android-api-15']
 
     bouncer_mh_cfg = {
         "script_name": "scripts/bouncer_submitter.py",
         "extra_args": [
              "-c",  branch_config['bouncer_submitter_config'][product],
              "--credentials-file", "oauth.txt",
              "--bouncer-api-prefix", branch_config['tuxedoServerUrl'],
              "--repo", branch_config['repo_path'],