Bug 1126493 - rollout 10.10 tests in a way that doesn't impact wait times r=coop
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -1557,17 +1557,17 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["web_platform_tests/prod_config.py"],
},
'mozbase': {
'config_files': ["unittests/mac_unittest.py"],
},
},
},
'yosemite': {
- 'opt_unittest_suites': [],
+ 'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
'debug_unittest_suites': [],
'suite_config': {
'mochitest': {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
@@ -1797,20 +1797,22 @@ BRANCHES['mozilla-release']['pgo_strateg
BRANCHES['mozilla-release']['platforms']['win32']['talos_slave_platforms'] = []
BRANCHES['mozilla-release']['platforms']['macosx64']['talos_slave_platforms'] = []
BRANCHES['mozilla-release']['platforms']['linux']['talos_slave_platforms'] = []
BRANCHES['mozilla-release']['platforms']['linux64']['talos_slave_platforms'] = []
######### mozilla-beta
BRANCHES['mozilla-beta']['repo_path'] = "releases/mozilla-beta"
BRANCHES['mozilla-beta']['pgo_strategy'] = 'per-checkin'
+BRANCHES['mozilla-beta']['platforms']['macosx64']['talos_slave_platforms'] = ['snowleopard', 'mountainlion']
######### mozilla-aurora
BRANCHES['mozilla-aurora']['repo_path'] = "releases/mozilla-aurora"
BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin'
+BRANCHES['mozilla-aurora']['platforms']['macosx64']['talos_slave_platforms'] = ['snowleopard', 'mountainlion']
######### mozilla-esr31
BRANCHES['mozilla-esr31']['repo_path'] = "releases/mozilla-esr31"
BRANCHES['mozilla-esr31']['pgo_strategy'] = 'per-checkin'
BRANCHES['mozilla-esr31']['platforms']['win32']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr31']['platforms']['macosx64']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr31']['platforms']['linux']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr31']['platforms']['linux64']['talos_slave_platforms'] = []
@@ -1926,19 +1928,16 @@ for platform in BRANCHES['holly']['platf
slave_p['opt_unittest_suites'] = MOCHITEST + REFTEST_ONE_CHUNK + REFTEST_NO_IPC + MOCHITEST_DT
slave_p['debug_unittest_suites'] = MOCHITEST + REFTEST_ONE_CHUNK + REFTEST_NO_IPC + MOCHITEST_DT_4
# Enable content sandbox tests for Windows bit
if slave_platform in PLATFORMS['win64']['slave_platforms'] or slave_platform in PLATFORMS['win32']['slave_platforms']:
slave_p['opt_unittest_suites'] += MOCHITEST_CSB
slave_p['debug_unittest_suites'] += MOCHITEST_CSB
-# Enable Yosemite testing on select branches only
-delete_slave_platform(BRANCHES, PLATFORMS, {'macosx64': 'yosemite'}, branch_exclusions=['try'])
-
# Run mochitest-jetpack tests everywhere except on versioned B2G branches
# starting from 39.
for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
if name.startswith('mozilla-b2g'):
continue
for pf in PLATFORMS:
if pf not in branch['platforms']:
continue
@@ -2182,16 +2181,38 @@ for branch in BRANCHES.keys():
enabled_platforms_for_os = BRANCHES[branch]['platforms'][os]['talos_slave_platforms']
for s in SUITES.iterkeys():
tests_key = '%s_tests' % s
if tests_key in BRANCHES[branch]:
tests = list(BRANCHES[branch]['%s_tests' % s])
tests[3] = [x for x in tests[3] if x not in platforms_for_os or x in enabled_platforms_for_os]
BRANCHES[branch]['%s_tests' % s] = tuple(tests)
+# bug 1126493 Enable Yosemite testing on select branches only
+# keep debug tests on 10.8 until the source of the slowness is found in bug 1125998
+include_yosemite = ['try']
+for platform in PLATFORMS.keys():
+ # See Bug 997946 - skip these on OS X 10.8 due to limited capacity
+ for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
+ if platform not in branch['platforms']:
+ continue
+ for slave_platform in branch['platforms'][platform]:
+ if slave_platform not in ['mountainlion', 'yosemite']:
+ continue
+ if name not in include_yosemite:
+ include_yosemite.append(name)
+delete_slave_platform(BRANCHES, PLATFORMS, {'macosx64': 'yosemite'}, branch_exclusions=include_yosemite)
+for branch in include_yosemite:
+ BRANCHES[branch]['platforms']['macosx64']['mountainlion']['opt_unittest_suites'] = []
+ #disable talos on branches that have 10.10 enabled excluding try
+ #and b2g-inbound didn't have talos tests before
+ if branch in ['try', 'b2g-inbound']:
+ continue
+ BRANCHES[branch]['platforms']['macosx64']['talos_slave_platforms'] = ['snowleopard','yosemite']
+
# Versioned b2g branches shouldn't run mochitest-browser-chrome on linux debug builds
for name in [x for x in BRANCHES.keys() if x.startswith('mozilla-b2g')]:
branch = BRANCHES[name]
if 'linux' in branch['platforms'] and 'ubuntu32_vm' in branch['platforms']['linux']:
for chunked_bc in MOCHITEST_BC_3:
branch['platforms']['linux']['ubuntu32_vm']['debug_unittest_suites'].remove(chunked_bc)
if 'linux64' in branch['platforms'] and 'ubuntu64_vm' in branch['platforms']['linux64']:
for chunked_bc in MOCHITEST_BC_3: