Bug 990490 - stop running talos on OSX 10.6. r=armenzg
authorJoel Maher <jmaher@mozilla.com>
Tue, 21 Apr 2015 13:02:39 -0400
changeset 12210 63762f3232e5043ed1ac9dd92f0f766a3c0aca4c
parent 12209 9c105b6c3d71aa2f7ed6a43ed55f54e5c2487082
child 12211 83a60eef2545f9366306ee15da88423980ba8c7e
push id8828
push userjmaher@mozilla.com
push dateTue, 21 Apr 2015 17:02:54 +0000
reviewersarmenzg
bugs990490
Bug 990490 - stop running talos on OSX 10.6. r=armenzg
mozilla-tests/config.py
mozilla-tests/config_common.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -223,26 +223,23 @@ for platform, platform_config in PLATFOR
     for slave_platform in all_slave_platforms:
         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'))
+ALL_TALOS_PLATFORMS = [platform for platform in ALL_TALOS_PLATFORMS if platform != 'snowleopard']
 NO_WINXP = [platform for platform in ALL_TALOS_PLATFORMS if platform != 'xp-ix']
 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']
+NO_LINUX64 = [platform for platform in NO_LINUX64 if platform != 'snowleopard']
 
 def win864_to_win8(platforms):
     retval = []
     for p in platforms:
         if p == 'win8_64':
             retval.append('win8')
         else:
             retval.append(p)
@@ -259,127 +256,87 @@ 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_NO_SNOW),
+        '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_SNOW_WINXP),
+        'options': (TALOS_TP_NEW_OPTS, NO_WINXP),
     },
     'g1': {
         'enable_by_default': True,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
-        '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),
+        '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_SNOW_WINXP),
-    },
-    'g1-snow-e10s': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'glterrain', '--filter', 'ignore_first:1', '--filter', 'median'],
-        'options': ({}, OSX_SNOW_ONLY),
+        'options': (TALOS_TP_NEW_OPTS, NO_WINXP),
     },
     'other': {
         'enable_by_default': False,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
-        '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),
+        'options': ({}, ALL_TALOS_PLATFORMS),
     },
     'other_nol64': {
         'enable_by_default': True,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
-        'options': ({}, NO_SNOW_LINUX64),
+        'options': ({}, NO_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_SNOW_LINUX64),
+        'options': ({}, NO_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_NO_SNOW),
-    },
-    'svgr-snow': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr', '--filter', 'ignore_first:5', '--filter', 'median'],
-        'options': ({}, OSX_SNOW_ONLY),
+        'options': ({}, ALL_TALOS_PLATFORMS),
     },
     'svgr-e10s': {
         'enable_by_default': False,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
-        '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),
+        'options': ({}, NO_WINXP),
     },
     'dromaeojs': {
         'enable_by_default': True,
         'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
-        'options': ({}, NO_SNOW_WINXP),
+        'options': ({}, NO_WINXP),
     },
     'dromaeojs-e10s': {
         'enable_by_default': False,
         'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
-        'options': ({}, NO_SNOW_WINXP),
+        'options': ({}, NO_WINXP),
     },
     'chromez': {
         'enable_by_default': True,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
-        'options': ({}, ALL_NO_SNOW),
+        'options': ({}, ALL_TALOS_PLATFORMS),
     },
     'chromez-e10s': {
         'enable_by_default': False,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
-        '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),
+        'options': ({}, NO_WINXP),
     },
 }
 
 BRANCH_UNITTEST_VARS = {
     'hghost': 'hg.mozilla.org',
     # turn on platforms as we get them running
     'platforms': {
         'linux': {},
@@ -1847,43 +1804,40 @@ 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_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']['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']['other-e10s_l64_tests'] = (1, False, {}, LINUX64_ONLY)
-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']['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']['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'
 BRANCHES['mozilla-beta']['platforms']['macosx64']['talos_slave_platforms'] = ['snowleopard', 'yosemite']
 
 ######### mozilla-aurora
 BRANCHES['mozilla-aurora']['repo_path'] = "releases/mozilla-aurora"
@@ -1938,25 +1892,21 @@ 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_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']['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']['other_l64_tests'] = (1, False, {}, LINUX64_ONLY)
-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']['g1_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS)
 BRANCHES['try']['pgo_strategy'] = 'try'
 BRANCHES['try']['enable_try'] = True
 BRANCHES['try']['platforms']['macosx64']['yosemite']['opt_unittest_suites'] = UNITTEST_SUITES['opt_unittest_suites'][:]
 BRANCHES['try']['platforms']['macosx64']['yosemite']['debug_unittest_suites'] = UNITTEST_SUITES['debug_unittest_suites'][:]
 
 ######## cedar
 BRANCHES['cedar']['platforms']['linux']['ubuntu32_vm']['opt_unittest_suites'] += MOCHITEST_PUSH[:]
 BRANCHES['cedar']['platforms']['linux']['ubuntu32_vm']['debug_unittest_suites'] += MOCHITEST_PUSH[:]
--- a/mozilla-tests/config_common.py
+++ b/mozilla-tests/config_common.py
@@ -67,16 +67,18 @@ def nested_haskey(dictionary, *keys):
 
 
 def get_talos_slave_platforms(platforms_dict, platforms):
     """Returns talos_slave_platforms if defined or slave_platform otherwise"""
     ret = []
     for p in platforms:
         ret.extend(platforms_dict[p].get('talos_slave_platforms',
                                          platforms_dict[p]['slave_platforms']))
+
+    ret = [platform for platform in ret if platform != 'snowleopard']
     return ret
 
 def delete_slave_platform(BRANCHES, PLATFORMS, platforms_to_delete, branch_exclusions=[]):
     for branch in set(BRANCHES.keys()) - set(branch_exclusions):
         for platform, slave_platform in platforms_to_delete.iteritems():
             if platform not in BRANCHES[branch]['platforms']:
                 continue
             if nested_haskey(BRANCHES[branch]['platforms'], platform, slave_platform):