Bug 1293730 - Do not remove nor change android-x86 platform properties on release branches. r=jlund
authorRail Aliiev <rail@mozilla.com>
Mon, 14 Nov 2016 11:58:18 +0100
changeset 14488 a81a10dad9f01fa8d6130c512c176ebf779c9785
parent 14486 8bb37036e9d2698a5d331da83bae0e03d5ff0d54
child 14489 f4a0f05cf1fba6bfaebd61697ef8c57a3206b3eb
child 15001 e04a44ce5ba6ff84954d0bd25c038bf9108ecd3d
push id124
push userbmo:rail@mozilla.com
push dateMon, 14 Nov 2016 10:59:06 +0000
reviewersjlund
bugs1293730
Bug 1293730 - Do not remove nor change android-x86 platform properties on release branches. r=jlund MozReview-Commit-ID: BncJLIaq6sh
mozilla/config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2922,17 +2922,17 @@ for name, branch in items_at_least(BRANC
         for platform in ['linux64-add-on-devel', 'macosx64-add-on-devel', 'win32-add-on-devel', 'win64-add-on-devel']:
             if platform in branch['platforms']:
                 del branch['platforms'][platform]
 
 # Bug 1293730 - Fennec x86 builds as tier 1
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 51):
     for platform in branch['platforms'].keys():
         if 'android-x86' in platform:
-            if branch['enable_nightly']:
+            if branch['enable_nightly'] or branch.get("enable_release_promotion"):
                 # keep the nightly but remove the CI equivalent
                 branch['platforms'][platform]["enable_dep"] = False
             else:
                 # remove all the android-x86 build jobs on this branch
                 del branch['platforms'][platform]
 
 
 if __name__ == "__main__":