--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -68,31 +68,29 @@ PLATFORMS = {
'linux': {},
'linux64': {},
'linux64-asan': {},
'macosx64': {},
'win32': {},
'win64': {},
}
-PLATFORMS['macosx64']['slave_platforms'] = ['snowleopard', 'yosemite', 'yosemite_r7']
+PLATFORMS['macosx64']['slave_platforms'] = ['snowleopard', 'yosemite_r7']
PLATFORMS['macosx64']['env_name'] = 'mac-perf'
PLATFORMS['macosx64']['snowleopard'] = {'name': "Rev4 MacOSX Snow Leopard 10.6",
'try_by_default': False}
-PLATFORMS['macosx64']['yosemite'] = {'name': "Rev5 MacOSX Yosemite 10.10",
- 'try_by_default': False}
PLATFORMS['macosx64']['yosemite_r7'] = {'name': "Rev7 MacOSX Yosemite 10.10.5"}
PLATFORMS['macosx64']['stage_product'] = 'firefox'
PLATFORMS['macosx64']['mozharness_config'] = {
'mozharness_python': ['/tools/buildbot/bin/python', '-u'],
'hg_bin': 'hg',
'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
'config_file': 'talos/mac_config.py',
}
-PLATFORMS['macosx64']['talos_slave_platforms'] = ['yosemite', 'yosemite_r7']
+PLATFORMS['macosx64']['talos_slave_platforms'] = ['yosemite_r7']
PLATFORMS['win32']['slave_platforms'] = ['xp_ix', 'win7_ix', 'win7_vm', 'win7_vm_gfx']
PLATFORMS['win32']['talos_slave_platforms'] = ['win7_ix']
PLATFORMS['win32']['env_name'] = 'win32-perf'
PLATFORMS['win32']['xp_ix'] = {'name': "Windows XP 32-bit",
'try_by_default': False}
PLATFORMS['win32']['win7_ix'] = {'name': "Windows 7 32-bit"}
PLATFORMS['win32']['win7_vm'] = {'name': "Windows 7 VM 32-bit"}
@@ -2245,142 +2243,16 @@ PLATFORM_UNITTEST_VARS = {
'webapprt-chrome': {
'config_files': ["unittests/mac_unittest.py"],
},
'xpcshell': {
'config_files': ["unittests/mac_unittest.py"],
},
},
},
- 'yosemite': {
- 'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'] + REFTEST_ONE_CHUNK,
- 'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'] + REFTEST_TWO_CHUNKS,
- 'suite_config': {
- 'mochitest-gpu': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-gpu-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-clipboard': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-clipboard-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'cppunit': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'gtest': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'jittest': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'marionette': {
- 'config_files': ["marionette/prod_config.py"],
- },
- 'media-tests': {
- 'config_files': ["mediatests/buildbot_posix_config.py"],
- },
- 'media-youtube-tests': {
- 'config_files': ["mediatests/buildbot_posix_config.py"],
- },
- 'mochitest': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-a11y': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-browser-chrome': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-e10s-browser-chrome': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-browser-screenshots': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-chrome': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-devtools-chrome': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-e10s-devtools-chrome': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-gl': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-gl-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-jetpack': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-media': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-media-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mochitest-other': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'mozbase': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'crashtest': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'crashtest-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'jsreftest': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'jsreftest-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'reftest': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'reftest-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'reftest-no-accel': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'reftest-no-accel-e10s': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'web-platform-tests': {
- 'config_files': ["web_platform_tests/prod_config.py"],
- },
- 'web-platform-tests-e10s': {
- 'config_files': ["web_platform_tests/prod_config.py"],
- },
- 'web-platform-tests-reftests': {
- 'config_files': ["web_platform_tests/prod_config.py"],
- },
- 'web-platform-tests-reftests-e10s': {
- 'config_files': ["web_platform_tests/prod_config.py"],
- },
- 'webapprt-chrome': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'xpcshell': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- },
- },
'yosemite_r7': {
'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'] + JITTEST + REFTEST_ONE_CHUNK,
'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'] + JITTEST + \
MOCHITEST_5 + REFTEST_TWO_CHUNKS,
'suite_config': {
'mochitest-gpu': {
'config_files': ["unittests/mac_unittest.py"],
},
@@ -2827,17 +2699,17 @@ for branch in BRANCHES.keys():
BRANCHES[branch]['platforms'][platform][slave_platform]['opt_unittest_suites'] += xpc_opt_suite
BRANCHES[branch]['platforms'][platform][slave_platform]['debug_unittest_suites'] += xpc_debug_suite
# Enable mediatests on gecko >= 44 (bug 1209258)
for name, branch in items_at_least(BRANCHES, 'gecko_version', 44):
for platform in PLATFORMS.keys():
if platform not in branch['platforms']:
continue
- for slave_platform in ('ubuntu64_vm', 'ubuntu64-asan_vm', 'win7_ix', 'win8_64', 'yosemite'):
+ for slave_platform in ('ubuntu64_vm', 'ubuntu64-asan_vm', 'win7_ix', 'win8_64', 'yosemite_r7'):
if slave_platform in branch['platforms'][platform]:
branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MEDIATESTS
branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += MEDIATESTS
# Enable mediatest-youtube-tests on gecko >= 46 (bug 1221963)
for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
for platform in PLATFORMS.keys():
if platform not in branch['platforms']:
@@ -2905,28 +2777,16 @@ for name, branch in items_at_least(BRANC
# Enable win10 on Try only
delete_slave_platform(BRANCHES, PLATFORMS, {'win64': 'win10_64'}, branch_exclusions=["try"])
ride_trains_branches = []
for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
ride_trains_branches.append(name)
-r7_active_branches = []
-for name, branch in items_at_least(BRANCHES, 'gecko_version', 43):
- r7_active_branches.append(name)
-
-r7_inactive_branches = []
-for name, branch in items_before(BRANCHES, 'gecko_version', 43):
- r7_inactive_branches.append(name)
-
-# Bug 1203128 - enable r7 on trunk and disable r5 on trunk
-delete_slave_platform(BRANCHES, PLATFORMS, {'macosx64': 'yosemite_r7'}, branch_exclusions=r7_active_branches)
-delete_slave_platform(BRANCHES, PLATFORMS, {'macosx64': 'yosemite'}, branch_exclusions=r7_inactive_branches)
-
# TALOS: If you set 'talos_slave_platforms' for a branch you will only get that subset of platforms
for branch in BRANCHES.keys():
for os in PLATFORMS.keys(): # 'macosx64', 'win32' and on
if os not in BRANCHES[branch]['platforms'].keys():
continue
if BRANCHES[branch]['platforms'][os].get('talos_slave_platforms') is None:
continue
platforms_for_os = get_talos_slave_platforms(PLATFORMS, platforms=(os,))
@@ -2942,17 +2802,17 @@ for branch in BRANCHES.keys():
for platform in PLATFORMS.keys():
if platform not in ['linux', 'linux64', 'linux64-asan', 'macosx64', 'win32', 'win64']:
continue
for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
for slave_platform in PLATFORMS[platform]['slave_platforms']:
# Not stable on windows XP
- if slave_platform in ['xp_ix', 'win10_64', 'yosemite']:
+ if slave_platform in ['xp_ix', 'win10_64']:
continue
# Don't run on win7_vm_gfx
if slave_platform == 'win7_vm_gfx':
continue
if platform in BRANCHES[name]['platforms']:
if (platform in ['linux64'] and slave_platform in ['ubuntu64_vm']) or (platform in ['linux64-asan'] and slave_platform in ['ubuntu64-asan_vm']):
continue--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -1,17 +1,16 @@
SLAVES = {
'xp_ix': {},
'win7_ix': {},
'win7_vm': {},
'win7_vm_gfx': {},
'win8': {},
'win10': {},
'snowleopard': {},
- 'yosemite': {},
'yosemite_r7': {},
'ubuntu32_vm': {},
'ubuntu64_vm': {},
'ubuntu64_vm_large': {},
'ubuntu64_vm_lnx_large': {},
'ubuntu64-asan_vm_lnx_large': {},
'ubuntu64_hw': {},
'win64_vm': {},
@@ -37,27 +36,24 @@ for i in range(1, 102) + range(103, 207)
SLAVES['win8']['t-w864-ix-%03i' % i] = {}
for i in range(1, 3) + range(11, 12): # Bug 1252258
SLAVES['win10']['t-w1064-ix-%04i' % i] = {}
for i in range(102, 103): # Use win8's 102 for win10 // Bug 1191481
SLAVES['win10']['t-w864-ix-%03i' % i] = {}
for i in range(1, 601): # added in Bug 1304065
- SLAVES['win10']['t-w10-spot-%03i' % i] = {}
+ SLAVES['win10']['t-w10-spot-%03i' % i] = {}
for i in range(1, 201): # added in Bug 1304065
SLAVES['win10']['g-w10-spot-%03i' % i] = {}
for i in range(86, 93) + range(95, 98): # slaves 0034&0093&0094&0153 have been decommed // Bug 1279394 // Bug 1292656
SLAVES['snowleopard']['t-snow-r4-%04i' % i] = {}
-for i in range(1, 3) + range(7, 8): #slaves decomm bug 1226180
- SLAVES['yosemite']['t-yosemite-r5-%04i' % i] = {}
-
for i in range(1, 393):
SLAVES['yosemite_r7']['t-yosemite-r7-%04i' % i] = {}
for i in range(1, 800) + range(1000, 1100):
SLAVES['ubuntu32_vm']['tst-linux32-spot-%03i' % i] = {}
for i in range(1, 200) + range(301, 500) + range(601, 800) + range(901, 1100) + range(1201, 1452): # Bug 1252248
SLAVES['ubuntu64_vm_large']['tst-emulator64-spot-%03i' % i] = {}