--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -210,22 +210,26 @@ for platform, platform_config in PLATFOR
platform_config[slave_platform]['slaves'] = sorted(SLAVES[slave_platform])
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'))
NO_WINXP = [platform for platform in ALL_TALOS_PLATFORMS if platform != 'xp-ix']
-MAC_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('macosx64',))
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'))
+OSX_SNOW_ONLY = [platform for platform in ALL_TALOS_PLATFORMS if platform == 'snowleopard']
+ALL_NO_SNOW = [platform for platform in ALL_TALOS_PLATFORMS if platform != 'snowleopard']
+NO_SNOW_LINUX64 = [platform for platform in NO_LINUX64 if platform != 'snowleopard']
+NO_SNOW_WINXP = [platform for platform in NO_WINXP if platform != 'snowleopard']
+
def win864_to_win8(platforms):
retval = []
for p in platforms:
if p == 'win8_64':
retval.append('win8')
else:
retval.append(p)
return retval
@@ -241,87 +245,127 @@ SUITES = {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5n', '--sampleConfig', 'xperf.config', '--mozAfterPaint', '--xperf_path',
'"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe"', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, WIN7_ONLY),
},
'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),
+ 'options': (TALOS_TP_NEW_OPTS, ALL_NO_SNOW),
},
'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_WINXP),
+ 'options': (TALOS_TP_NEW_OPTS, NO_SNOW_WINXP),
},
'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),
+ 'options': (TALOS_TP_NEW_OPTS, ALL_NO_SNOW),
+ },
+ 'g1-snow': {
+ 'enable_by_default': True,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'glterrain', '--filter', 'ignore_first:1', '--filter', 'median'],
+ 'options': ({}, OSX_SNOW_ONLY),
},
'g1-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
- 'options': (TALOS_TP_NEW_OPTS, NO_WINXP),
+ 'options': (TALOS_TP_NEW_OPTS, NO_SNOW_WINXP),
+ },
+ 'g1-snow-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'glterrain', '--filter', 'ignore_first:1', '--filter', 'median'],
+ 'options': ({}, OSX_SNOW_ONLY),
},
'other': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': ({}, ALL_TALOS_PLATFORMS),
+ 'options': ({}, ALL_NO_SNOW),
+ },
+ 'other-snow': {
+ 'enable_by_default': True,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, OSX_SNOW_ONLY),
},
'other_nol64': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': ({}, NO_LINUX64),
+ 'options': ({}, NO_SNOW_LINUX64),
},
'other-e10s_nol64': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': ({}, NO_LINUX64),
+ 'options': ({}, NO_SNOW_LINUX64),
},
'other_l64': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, LINUX64_ONLY),
},
+ 'other-snow-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr::tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, OSX_SNOW_ONLY),
+ },
'other-e10s_l64': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, LINUX64_ONLY),
},
'svgr': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': ({}, ALL_TALOS_PLATFORMS),
+ 'options': ({}, ALL_NO_SNOW),
+ },
+ 'svgr-snow': {
+ 'enable_by_default': True,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, OSX_SNOW_ONLY),
},
'svgr-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': ({}, NO_WINXP),
+ 'options': ({}, NO_SNOW_WINXP),
+ },
+ 'svgr-snow-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, OSX_SNOW_ONLY),
},
'dromaeojs': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
- 'options': ({}, NO_WINXP),
+ 'options': ({}, NO_SNOW_WINXP),
},
'dromaeojs-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
- 'options': ({}, NO_WINXP),
+ 'options': ({}, NO_SNOW_WINXP),
},
'chromez': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': ({}, ALL_TALOS_PLATFORMS),
+ 'options': ({}, ALL_NO_SNOW),
},
'chromez-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
- 'options': ({}, NO_WINXP),
+ 'options': ({}, NO_SNOW_WINXP),
+ },
+ 'chromez-snow': {
+ 'enable_by_default': True,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, OSX_SNOW_ONLY),
+ },
+ 'chromez-snow-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, OSX_SNOW_ONLY),
},
}
BRANCH_UNITTEST_VARS = {
'hghost': 'hg.mozilla.org',
# turn on platforms as we get them running
'platforms': {
'linux': {},
@@ -1700,40 +1744,43 @@ 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_WINXP)
-BRANCHES['mozilla-central']['g1-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_WINXP)
-BRANCHES['mozilla-central']['other-e10s_nol64_tests'] = (1, False, {}, NO_LINUX64)
+BRANCHES['mozilla-central']['tp5o-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_SNOW_WINXP)
+BRANCHES['mozilla-central']['g1-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_SNOW_WINXP)
+BRANCHES['mozilla-central']['g1-snow-e10s_tests'] = (1, False, {}, OSX_SNOW_ONLY)
+BRANCHES['mozilla-central']['other-e10s_nol64_tests'] = (1, False, {}, NO_SNOW_LINUX64)
BRANCHES['mozilla-central']['other-e10s_l64_tests'] = (1, False, {}, LINUX64_ONLY)
-BRANCHES['mozilla-central']['svgr-e10s_tests'] = (1, False, {}, NO_WINXP)
-BRANCHES['mozilla-central']['dromaeojs-e10s_tests'] = (1, False, {}, NO_WINXP)
-BRANCHES['mozilla-central']['chromez-e10s_tests'] = (1, False, {}, NO_WINXP)
+BRANCHES['mozilla-central']['other-snow-e10s_tests'] = (1, False, {}, OSX_SNOW_ONLY)
+BRANCHES['mozilla-central']['svgr-e10s_tests'] = (1, False, {}, NO_SNOW_WINXP)
+BRANCHES['mozilla-central']['svgr-snow-e10s_tests'] = (1, False, {}, OSX_SNOW_ONLY)
+BRANCHES['mozilla-central']['dromaeojs-e10s_tests'] = (1, False, {}, NO_SNOW_WINXP)
+BRANCHES['mozilla-central']['chromez-e10s_tests'] = (1, False, {}, NO_SNOW_WINXP)
+BRANCHES['mozilla-central']['chromez-snow-e10s_tests'] = (1, False, {}, OSX_SNOW_ONLY)
BRANCHES['mozilla-central']['pgo_only_suites'] = ['g1-e10s', 'xperf-e10s',
'tp5o-e10s',
'other-e10s_nol64',
'other-e10s_l64',
'svgr-e10s',
'dromaeojs-e10s',
'chromez-e10s']
######### mozilla-release
BRANCHES['mozilla-release']['repo_path'] = "releases/mozilla-release"
BRANCHES['mozilla-release']['pgo_strategy'] = 'per-checkin'
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'] = []
-#BRANCHES['mozilla-release']['platforms']['win64']['talos_slave_platforms'] = []
######### mozilla-beta
BRANCHES['mozilla-beta']['repo_path'] = "releases/mozilla-beta"
BRANCHES['mozilla-beta']['pgo_strategy'] = 'per-checkin'
######### mozilla-aurora
BRANCHES['mozilla-aurora']['repo_path'] = "releases/mozilla-aurora"
BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin'
@@ -1777,21 +1824,25 @@ BRANCHES['mozilla-b2g37_v2_2']['platform
BRANCHES['mozilla-b2g37_v2_2']['platforms']['macosx64']['talos_slave_platforms'] = []
BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux']['talos_slave_platforms'] = []
BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux64']['talos_slave_platforms'] = []
######## try
BRANCHES['try']['repo_path'] = "try"
BRANCHES['try']['xperf_tests'] = (1, False, TALOS_TP_NEW_OPTS, WIN7_ONLY)
-BRANCHES['try']['tp5o_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS)
-BRANCHES['try']['other_tests'] = (0, False, {}, ALL_TALOS_PLATFORMS)
-BRANCHES['try']['other_nol64_tests'] = (1, False, {}, NO_LINUX64)
+BRANCHES['try']['tp5o_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_NO_SNOW)
+BRANCHES['try']['other_tests'] = (0, False, {}, ALL_NO_SNOW)
+BRANCHES['try']['other-snow_tests'] = (1, False, {}, OSX_SNOW_ONLY)
+BRANCHES['try']['other_nol64_tests'] = (1, False, {}, NO_SNOW_LINUX64)
BRANCHES['try']['other_l64_tests'] = (1, False, {}, LINUX64_ONLY)
-BRANCHES['try']['g1_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS)
+BRANCHES['try']['g1-snow_tests'] = (1, False, {}, OSX_SNOW_ONLY)
+BRANCHES['try']['g1_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_NO_SNOW)
+BRANCHES['try']['chromez-snow_tests'] = (1, False, {}, OSX_SNOW_ONLY)
+BRANCHES['try']['svgr-snow_tests'] = (1, False, {}, OSX_SNOW_ONLY)
BRANCHES['try']['pgo_strategy'] = 'try'
BRANCHES['try']['enable_try'] = True
BRANCHES['try']['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/testing/mozharness/mozharness.json"
######## ash
BRANCHES['ash']['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/testing/mozharness/mozharness.json"