Bug 1250999 - releng - remove api-9-10 from trunk, r=kmoir
authorJordan Lund <jlund@mozilla.com>
Wed, 09 Mar 2016 14:13:28 -0800
changeset 13948 1bbe091937b40a840ba8ef4b130dea411ec7d8be
parent 13946 95e902ea4772d43dae971febcf25065df6f6dc83
child 13949 771999c6f4efece57bb578f1367556fbe6a365c9
push id9804
push userjlund@mozilla.com
push dateThu, 10 Mar 2016 18:25:51 +0000
reviewerskmoir
bugs1250999
Bug 1250999 - releng - remove api-9-10 from trunk, r=kmoir MozReview-Commit-ID: C5NsNTXOPLR
mozilla-tests/config_seta.py
mozilla-tests/mobile_config.py
mozilla/config.py
--- a/mozilla-tests/config_seta.py
+++ b/mozilla-tests/config_seta.py
@@ -18,24 +18,22 @@ seta_platforms = {"Rev4 MacOSX Snow Leop
                   "Windows 8 64-bit": ("win64", ["win8_64"]),
                   "Ubuntu VM 12.04": ("linux", ["ubuntu32_vm"]),
                   "Ubuntu VM 12.04 x64": ("linux64", ["ubuntu64_vm", "ubuntu64_vm_lnx_large"]),
                   "Ubuntu HW 12.04 x64": ("linux64", ["ubuntu64_hw"]),
                   "Ubuntu ASAN VM 12.04 x64": ("linux64-asan", ["ubuntu64-asan_vm", "ubuntu64-asan_vm_lnx_large"]),
                   "Ubuntu TSAN VM 12.04 x64": ("linux64-tsan", ["ubuntu64_vm", "ubuntu64_vm_lnx_large"]),
                   "Rev7 MacOSX Yosemite 10.10.5": ("macosx64", ["yosemite_r7"]),
                   "Ubuntu Code Coverage VM 12.04 x64": ("linux64-cc", ["ubuntu64_vm", "ubuntu64_vm_lnx_large"]),
-                  "android-2-3-armv7-api9": ("android-api-9", ["ubuntu64_vm_mobile", "ubuntu64_vm_large"]),
                   "android-4-3-armv7-api11": ("android-api-15", ["ubuntu64_vm_armv7_mobile", "ubuntu64_vm_armv7_large"]),
                   "android-4-3-armv7-api15": ("android-api-15", ["ubuntu64_vm_armv7_mobile", "ubuntu64_vm_armv7_large"])
                   }
 
 # platforms and tests to exclude from configs because they are deprecated or lacking data
-# platform_exclusions = ['android-4-3-armv7-api11']
-platform_exclusions = []
+platform_exclusions = ["android-2-3-armv7-api9"]
 test_exclusions = re.compile('\[funsize\]|\[TC\]')
 
 # define seta branches and default values for skipcount and skiptimeout
 skipconfig_defaults_platform = {}
 for sp in seta_platforms:
     for slave_sp in seta_platforms[sp][1]:
         if slave_sp in ["xp-ix"]:
             skipconfig_defaults_platform[slave_sp] = (14, 7200)
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -2625,17 +2625,16 @@ for branch in BRANCHES.keys():
 ######## mozilla-central
 BRANCHES['mozilla-central']['branch_name'] = "Firefox"
 BRANCHES['mozilla-central']['repo_path'] = "mozilla-central"
 BRANCHES['mozilla-central']['mobile_branch_name'] = "Mobile"
 BRANCHES['mozilla-central']['mobile_talos_branch'] = "mobile"
 BRANCHES['mozilla-central']['build_branch'] = "1.9.2"
 BRANCHES['mozilla-central']['pgo_strategy'] = 'periodic'
 BRANCHES['mozilla-central']['pgo_platforms'] = []
-BRANCHES['mozilla-central']['platforms']['android-api-9']['enable_debug_unittests'] = True
 BRANCHES['mozilla-central']['platforms']['android-api-15']['enable_debug_unittests'] = True
 
 ######### mozilla-release
 BRANCHES['mozilla-release']['repo_path'] = "releases/mozilla-release"
 BRANCHES['mozilla-release']['pgo_strategy'] = 'per-checkin'
 BRANCHES['mozilla-release']['pgo_platforms'] = []
 
 ######### mozilla-beta
@@ -2645,28 +2644,24 @@ BRANCHES['mozilla-beta']['pgo_platforms'
 
 ######### mozilla-aurora
 BRANCHES['mozilla-aurora']['repo_path'] = "releases/mozilla-aurora"
 BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin'
 BRANCHES['mozilla-aurora']['pgo_platforms'] = []
 
 ######## try
 BRANCHES['try']['repo_path'] = "try"
-BRANCHES['try']['platforms']['android-api-9']['enable_debug_unittests'] = True
 BRANCHES['try']['platforms']['android-api-15']['enable_debug_unittests'] = True
 BRANCHES['try']['pgo_strategy'] = 'try'
 BRANCHES['try']['pgo_platforms'] = []
 BRANCHES['try']['enable_try'] = True
 
 ######## cedar
 # Until we green out these Android x86 tests
 BRANCHES['cedar']['platforms']['android-x86']['ubuntu64_hw']['opt_unittest_suites'] = ANDROID_X86_NOT_GREEN_DICT[:]
-# Remove all panda tests from cedar
-if 'android-api-9' in BRANCHES['cedar']['platforms']:
-    del BRANCHES['cedar']['platforms']['android-api-9']
 
 #split 2.3 tests to ones that can run on ix and AWS
 for suite in ANDROID_2_3_MOZHARNESS_DICT:
     if suite[0].startswith('plain-reftest'):
         ANDROID_2_3_C3_DICT['opt_unittest_suites'].append(suite)
     elif suite[0].startswith('crashtest'):
         ANDROID_2_3_C3_DICT['opt_unittest_suites'].append(suite)
     elif suite[0].startswith('jsreftest'):
@@ -2823,17 +2818,23 @@ for name, branch in items_at_least(BRANC
             'opt_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['opt_unittest_suites']),
             'debug_unittest_suites': deepcopy(ANDROID_4_3_C3_TRUNK_DICT['debug_unittest_suites'] + ANDROID_4_3_MOZHARNESS_DEBUG_TRUNK),}
             BRANCHES[name]['platforms'][platform]['ubuntu64_vm_armv7_mobile'] = {
                 'opt_unittest_suites': deepcopy(ANDROID_4_3_AWS_DICT['opt_unittest_suites']),
                 'debug_unittest_suites': deepcopy(ANDROID_4_3_AWS_TRUNK_DICT['debug_unittest_suites']),
             }
             BRANCHES[name]['platforms'][platform]['ubuntu64_vm_armv7_large']['opt_unittest_suites'] += ANDROID_4_3_MOCHITEST_MEDIA
             BRANCHES[name]['platforms'][platform]['ubuntu64_vm_armv7_large']['debug_unittest_suites'] += ANDROID_4_3_MOCHITEST_MEDIA
-            
+
+# Bug 1250999 - releng - releng work for dropping api 9-10
+# disable api-9-10 mobile builds on >= 48 based branches
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 48):
+    if 'android-api-9' in branch['platforms']:
+        del branch['platforms']['android-api-9']
+
 def remove_suite_from_slave_platform(BRANCHES, PLATFORMS, suite_to_remove, slave_platform, branches_to_keep=[]):
     """Remove suites named like |suite_to_remove| from all branches on slave platforms named like |slave_platform|.
 
 Updates BRANCHES in place.  Consumes PLATFORMS without side
 effects. Does not remove any suites from the specified
 |branches_to_keep|."""
 
     for branch in BRANCHES:
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -3098,16 +3098,23 @@ for name, branch in items_at_least(BRANC
             del branch['platforms'][platform]
 
 # disable api-15 mobile builds on < 46 based branches
 for name, branch in items_before(BRANCHES, 'gecko_version', 46):
     for platform in branch['platforms'].keys():
         if 'api-15' in platform:
             del branch['platforms'][platform]
 
+# Bug 1250999 - releng - releng work for dropping api 9-10
+# disable api-9-10 mobile builds on >= 48 based branches
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 48):
+    for platform in branch['platforms'].keys():
+        if 'api-9' in platform:
+            del branch['platforms'][platform]
+
 if __name__ == "__main__":
     import sys
     import pprint
     args = sys.argv[1:]
 
     if len(args) > 0:
         items = dict([(b, BRANCHES[b]) for b in args])
     else: