Bug 1201910 - remove other_nol64 and other_l64 and replace with other. r=Callek
authorJoel Maher <jmaher@mozilla.com>
Fri, 04 Sep 2015 11:44:46 -0400 (2015-09-04)
changeset 12940 587498af0b76e228e62e40139fce518e520ea7d4
parent 12936 a20fef27da9b7647f67040aa4b1dc4772d321461
child 12941 40e7ca1f953dfbb7d289a9aa05be2e5c123c7dfd
push id9215
push userjmaher@mozilla.com
push dateFri, 04 Sep 2015 15:45:10 +0000 (2015-09-04)
reviewersCallek
bugs1201910
Bug 1201910 - remove other_nol64 and other_l64 and replace with other. r=Callek
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -265,44 +265,24 @@ SUITES = {
         'options': (TALOS_TP_NEW_OPTS, TALOS_PLATFORMS_NO_OSX),
     },
     'g2-osx-e10s': {
         'enable_by_default': False,
         'suites': GRAPH_CONFIG + ['--activeTests', 'damp', '--filter', 'ignore_first:1', '--filter', 'median'],
         'options': (TALOS_TP_NEW_OPTS, OSX_ONLY),
     },
     'other': {
-        'enable_by_default': False,
+        'enable_by_default': True,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
         '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_LINUX64),
-    },
-    'other-e10s_nol64': {
+    'other-e10s': {
         'enable_by_default': False,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
-        'options': ({}, NO_OSX_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-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),
-    },
-    'other-osx-e10s': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
-        'options': ({}, OSX_ONLY),
+        'options': ({}, ALL_TALOS_PLATFORMS),
     },
     'svgr': {
         'enable_by_default': True,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
         'options': ({}, ALL_TALOS_PLATFORMS),
     },
     'svgr-e10s': {
         'enable_by_default': False,
@@ -2009,67 +1989,60 @@ BRANCHES['mozilla-central']['build_branc
 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)
 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)
 #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)
 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']['other-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
 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)    
+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',
+                                                  'other-e10s',
                                                   'svgr-e10s',
                                                   'dromaeojs-e10s',
                                                   'chromez-e10s']
 
 
 
 ######### mozilla-inbound
 # no xperf here since it fails all the time
 BRANCHES['mozilla-inbound']['xperf-e10s_tests'] = (0, False, TALOS_TP_NEW_OPTS, WIN7_ONLY)
 BRANCHES['mozilla-inbound']['tp5o-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 BRANCHES['mozilla-inbound']['tp5o-osx-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, OSX_ONLY)
 BRANCHES['mozilla-inbound']['g1-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 #BRANCHES['mozilla-inbound']['g1-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 BRANCHES['mozilla-inbound']['g2-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 BRANCHES['mozilla-inbound']['g2-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
-BRANCHES['mozilla-inbound']['other-e10s_nol64_tests'] = (1, False, {}, NO_OSX_LINUX64)
-BRANCHES['mozilla-inbound']['other-e10s_l64_tests'] = (1, False, {}, LINUX64_ONLY)
-BRANCHES['mozilla-inbound']['other-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
+BRANCHES['mozilla-inbound']['other-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
 BRANCHES['mozilla-inbound']['svgr-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['mozilla-inbound']['svgr-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 BRANCHES['mozilla-inbound']['dromaeojs-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['mozilla-inbound']['chromez-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['mozilla-inbound']['chromez-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 
 
 ######### fx-team
 # no xperf here since it fails all the time
 BRANCHES['fx-team']['xperf-e10s_tests'] = (0, False, TALOS_TP_NEW_OPTS, WIN7_ONLY)
 BRANCHES['fx-team']['tp5o-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 BRANCHES['fx-team']['tp5o-osx-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, OSX_ONLY)
 BRANCHES['fx-team']['g1-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 #BRANCHES['fx-team']['g1-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 BRANCHES['fx-team']['g2-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 BRANCHES['fx-team']['g2-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
-BRANCHES['fx-team']['other-e10s_nol64_tests'] = (1, False, {}, NO_OSX_LINUX64)
-BRANCHES['fx-team']['other-e10s_l64_tests'] = (1, False, {}, LINUX64_ONLY)
-BRANCHES['fx-team']['other-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
+BRANCHES['fx-team']['other-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
 BRANCHES['fx-team']['svgr-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['fx-team']['svgr-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 BRANCHES['fx-team']['dromaeojs-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['fx-team']['chromez-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['fx-team']['chromez-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 
 
 ######### mozilla-release
@@ -2108,36 +2081,32 @@ BRANCHES['mozilla-b2g37_v2_2']['platform
 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']['other_l64_tests'] = (1, False, {}, LINUX64_ONLY)
+BRANCHES['try']['other_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
 BRANCHES['try']['g1_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS)
 BRANCHES['try']['g2_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS)
 BRANCHES['try']['pgo_strategy'] = None
 BRANCHES['try']['enable_try'] = True
 
 # now for e10s tests
 # no xperf here since it fails all the time
 BRANCHES['try']['xperf-e10s_tests'] = (0, False, TALOS_TP_NEW_OPTS, WIN7_ONLY)
 BRANCHES['try']['tp5o-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 BRANCHES['try']['tp5o-osx-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, OSX_ONLY)
 BRANCHES['try']['g1-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 #BRANCHES['try']['g1-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 BRANCHES['try']['g2-e10s_tests'] = (1, False, TALOS_TP_NEW_OPTS, NO_OSX)
 BRANCHES['try']['g2-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
-BRANCHES['try']['other-e10s_nol64_tests'] = (1, False, {}, NO_OSX_LINUX64)
-BRANCHES['try']['other-e10s_l64_tests'] = (1, False, {}, LINUX64_ONLY)
-BRANCHES['try']['other-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
+BRANCHES['try']['other-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
 BRANCHES['try']['svgr-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['try']['svgr-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 BRANCHES['try']['dromaeojs-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['try']['chromez-e10s_tests'] = (1, False, {}, NO_OSX)
 BRANCHES['try']['chromez-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
 
 
 loadSkipConfig(BRANCHES,"desktop")