--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -226,17 +226,17 @@ for platform, platform_config in PLATFOR
if slave_platform in TRY_SLAVES:
platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
else:
platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
ALL_TALOS_PLATFORMS = get_talos_slave_platforms(PLATFORMS, platforms=('linux', 'linux64', 'win32', 'macosx64', 'win64'))
TALOS_PLATFORMS_NO_OSX = get_talos_slave_platforms(PLATFORMS, platforms=('linux', 'linux64', 'win32', 'win64'))
NO_WINXP = [platform for platform in ALL_TALOS_PLATFORMS if platform != 'xp-ix']
-NO_OSX_WINXP = [platform for platform in NO_WINXP if platform != 'yosemite']
+NO_OSX = get_talos_slave_platforms(PLATFORMS, platforms=('linux', 'linux64', 'win32', 'win64'))
WIN7_ONLY = ['win7-ix']
WIN8_ONLY = ['win8_64']
LINUX64_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('linux64',))
NO_LINUX64 = get_talos_slave_platforms(PLATFORMS, platforms=('linux', 'win32', 'macosx64', 'win64'))
NO_OSX_LINUX64 = get_talos_slave_platforms(PLATFORMS, platforms=('linux', 'win32', 'win64'))
OSX_ONLY = [platform for platform in ALL_TALOS_PLATFORMS if platform == 'yosemite']
def win864_to_win8(platforms):
@@ -264,32 +264,32 @@ SUITES = {
'tp5o': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
'tp5o-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': (TALOS_TP_NEW_OPTS, NO_OSX_WINXP),
+ 'options': (TALOS_TP_NEW_OPTS, NO_OSX),
},
'tp5o-osx-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, OSX_ONLY),
},
'g1': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
'g1-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
- 'options': (TALOS_TP_NEW_OPTS, NO_OSX_WINXP),
+ 'options': (TALOS_TP_NEW_OPTS, NO_OSX),
},
'g1-osx-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, OSX_ONLY),
},
'g2': {
'enable_by_default': False,
@@ -354,27 +354,27 @@ SUITES = {
'dromaeojs': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
'options': ({}, NO_WINXP),
},
'dromaeojs-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
- 'options': ({}, NO_OSX_WINXP),
+ 'options': ({}, NO_OSX),
},
'chromez': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'chromez-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': ({}, NO_OSX_WINXP),
+ 'options': ({}, NO_OSX),
},
'chromez-osx-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, OSX_ONLY),
},
}
@@ -1872,29 +1872,29 @@ for branch in BRANCHES.keys():
# The following are exceptions to the defaults
######## mozilla-central
BRANCHES['mozilla-central']['branch_name'] = "Firefox"
BRANCHES['mozilla-central']['repo_path'] = "mozilla-central"
BRANCHES['mozilla-central']['build_branch'] = "1.9.2"
BRANCHES['mozilla-central']['pgo_strategy'] = 'periodic'
BRANCHES['mozilla-central']['xperf-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, WIN7_ONLY)
-BRANCHES['mozilla-central']['tp5o-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX_WINXP)
+BRANCHES['mozilla-central']['tp5o-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
BRANCHES['mozilla-central']['tp5o-osx-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, OSX_ONLY)
-BRANCHES['mozilla-central']['g1-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX_WINXP)
+BRANCHES['mozilla-central']['g1-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
BRANCHES['mozilla-central']['g1-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
-BRANCHES['mozilla-central']['g2-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX_WINXP)
+BRANCHES['mozilla-central']['g2-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
BRANCHES['mozilla-central']['g2-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
BRANCHES['mozilla-central']['other-e10s_nol64_tests'] = (1, False, {}, NO_OSX_LINUX64)
BRANCHES['mozilla-central']['other-e10s_l64_tests'] = (1, False, {}, LINUX64_ONLY)
BRANCHES['mozilla-central']['other-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
-BRANCHES['mozilla-central']['svgr-e10s_tests'] = (1, False, {}, NO_OSX_WINXP)
+BRANCHES['mozilla-central']['svgr-e10s_tests'] = (1, False, {}, NO_OSX)
BRANCHES['mozilla-central']['svgr-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
-BRANCHES['mozilla-central']['dromaeojs-e10s_tests'] = (1, False, {}, NO_OSX_WINXP)
-BRANCHES['mozilla-central']['chromez-e10s_tests'] = (1, False, {}, NO_OSX_WINXP)
+BRANCHES['mozilla-central']['dromaeojs-e10s_tests'] = (1, False, {}, NO_OSX)
+BRANCHES['mozilla-central']['chromez-e10s_tests'] = (1, False, {}, NO_OSX)
BRANCHES['mozilla-central']['chromez-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
BRANCHES['mozilla-central']['pgo_only_suites'] = ['g1-e10s',
'g2-e10s',
'xperf-e10s',
'tp5o-e10s',
'other-e10s_nol64',
'other-e10s_l64',
'svgr-e10s',