Bug 1131269 - use SETA data to disable unneeded tests r=catlee
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -12,16 +12,20 @@ from master_common import setMainFirefox
import project_branches
reload(project_branches)
from project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
import localconfig
reload(localconfig)
from localconfig import SLAVES, TRY_SLAVES, GLOBAL_VARS, GRAPH_CONFIG
+import config_seta
+reload(config_seta)
+from config_seta import loadSkipConfig
+
MOZHARNESS_REBOOT_CMD = ['scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt',
'-n', '1', '-z']
TALOS_DIRTY_OPTS = {'talosAddOns': ['profiles/dirtyDBs.zip', 'profiles/dirtyMaxDBs.zip']}
TALOS_TP_NEW_OPTS = {'plugins': {'32': 'zips/flash32_10_3_183_5.zip', '64': 'zips/flash64_11_0_d1_98.zip'}, 'pagesets': ['zips/tp5n.zip']}
@@ -1903,44 +1907,17 @@ BRANCHES['try']['platforms']['macosx64']
BRANCHES['cedar']['platforms']['linux64-asan']['ubuntu64-asan_vm']['opt_unittest_suites'] += MARIONETTE[:]
BRANCHES['cedar']['platforms']['win32']['xp-ix']['opt_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win32']['win7-ix']['opt_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win64']['win8_64']['opt_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win32']['xp-ix']['debug_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win32']['win7-ix']['debug_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win64']['win8_64']['debug_unittest_suites'] += REFTEST_OMTC[:]
-######## mozilla-inbound
-# Skip test runs (see bug 1056787)
-# Note that if we set this higher than 3, we'll start to get strange behaviour
-# due to the currently global coalescing limit of 3 defined at
-# http://hg.mozilla.org/build/buildbotcustom/file/e3713abcd36d/misc.py#l647
-BRANCHES['mozilla-inbound']['platforms']['win32']['xp-ix']['opt_unittest_skipcount'] = 2
-BRANCHES['mozilla-inbound']['platforms']['win32']['xp-ix']['opt_unittest_skiptimeout'] = 1800
-BRANCHES['mozilla-inbound']['platforms']['win32']['win7-ix']['opt_unittest_skipcount'] = 2
-BRANCHES['mozilla-inbound']['platforms']['win32']['win7-ix']['opt_unittest_skiptimeout'] = 1800
-BRANCHES['mozilla-inbound']['platforms']['win64']['win8_64']['opt_unittest_skipcount'] = 3
-BRANCHES['mozilla-inbound']['platforms']['win64']['win8_64']['opt_unittest_skiptimeout'] = 1800
-BRANCHES['mozilla-inbound']['platforms']['macosx64']['mountainlion']['opt_unittest_skipcount'] = 6
-BRANCHES['mozilla-inbound']['platforms']['macosx64']['mountainlion']['opt_unittest_skiptimeout'] = 3200
-BRANCHES['mozilla-inbound']['platforms']['win32']['xp-ix']['debug_unittest_skipcount'] = 2
-BRANCHES['mozilla-inbound']['platforms']['win32']['xp-ix']['debug_unittest_skiptimeout'] = 1800
-BRANCHES['mozilla-inbound']['platforms']['win32']['win7-ix']['debug_unittest_skipcount'] = 2
-BRANCHES['mozilla-inbound']['platforms']['win32']['win7-ix']['debug_unittest_skiptimeout'] = 1800
-BRANCHES['mozilla-inbound']['platforms']['win64']['win8_64']['debug_unittest_skipcount'] = 3
-BRANCHES['mozilla-inbound']['platforms']['win64']['win8_64']['debug_unittest_skiptimeout'] = 1800
-BRANCHES['mozilla-inbound']['platforms']['macosx64']['snowleopard']['debug_unittest_skipcount'] = 2
-BRANCHES['mozilla-inbound']['platforms']['macosx64']['snowleopard']['debug_unittest_skiptimeout'] = 1800
-BRANCHES['mozilla-inbound']['platforms']['macosx64']['mountainlion']['debug_unittest_skipcount'] = 6
-BRANCHES['mozilla-inbound']['platforms']['macosx64']['mountainlion']['debug_unittest_skiptimeout'] = 3200
-BRANCHES['mozilla-inbound']['platforms']['macosx64']['yosemite']['debug_unittest_skipcount'] = 2
-BRANCHES['mozilla-inbound']['platforms']['macosx64']['yosemite']['debug_unittest_skiptimeout'] = 1800
-BRANCHES['mozilla-inbound']['platforms']['linux']['ubuntu32_vm']['debug_unittest_skipcount'] = 2
-BRANCHES['mozilla-inbound']['platforms']['linux']['ubuntu32_vm']['debug_unittest_skiptimeout'] = 1800
-
+loadSkipConfig(BRANCHES)
# Enable mozharness pinning
for _, branch in items_at_least(BRANCHES, 'gecko_version', 30):
branch['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
"testing/mozharness/mozharness.json"
BRANCHES['mozilla-b2g30_v1_4']['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
--- a/setup-master.py
+++ b/setup-master.py
@@ -285,16 +285,17 @@ def load_masters_json(masters_json, role
c.globs.append('release_templates')
elif 'tests_scheduler' in m['name']:
c.config_dir = 'mozilla-tests'
c.globs.append(mastercfg)
c.globs.append('scheduler_localconfig.py')
c.local_links.append((mastercfg, 'master.cfg'))
c.local_links.append(
('scheduler_localconfig.py', 'master_localconfig.py'))
+ c.globs.append('config_seta.py')
retval.append(c)
return retval
if __name__ == "__main__":
from optparse import OptionParser