Bug 1131269 - use SETA data to disable unneeded tests on Windows 7 r=catlee
☠☠ backed out by 8d4058f55d28 ☠ ☠
authorkmoir@mozilla.com
Mon, 06 Apr 2015 10:37:42 -0400 (2015-04-06)
changeset 12124 26931539500e07aa04791a4bb66cf259d78f039f
parent 12122 e42097ec1f3538e68f0a17735fbe1c8ace016967
child 12125 48f3cb27767e328034d2d0854c0e5eb0ac343084
child 12126 8d4058f55d280044ce8f1ff217371327efd4a2b3
push id8773
push userkmoir@mozilla.com
push dateMon, 06 Apr 2015 14:38:20 +0000 (2015-04-06)
reviewerscatlee
bugs1131269
Bug 1131269 - use SETA data to disable unneeded tests on Windows 7 r=catlee
mozilla-tests/config.py
mozilla-tests/config_seta.py
--- 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']}
 
@@ -1892,44 +1896,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/" + \
new file mode 100644
--- /dev/null
+++ b/mozilla-tests/config_seta.py
@@ -0,0 +1,466 @@
+######## 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
+def loadSkipConfig(BRANCHES):
+    BRANCHES['fx-team']['platforms']['win32']['xp-ix']['skipconfig'] = {('debug', 'crashtest'): (3, 1800),
+                                                                        ('debug', 'jsreftest'): (3, 1800),
+                                                                        ('debug', 'marionette'): (3, 1800),
+                                                                        ('debug', 'mochitest-1'): (3, 1800),
+                                                                        ('debug', 'mochitest-2'): (3, 1800),
+                                                                        ('debug', 'mochitest-3'): (3, 1800),
+                                                                        ('debug', 'mochitest-4'): (3, 1800),
+                                                                        ('debug', 'mochitest-5'): (3, 1800),
+                                                                        ('debug', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                        ('debug', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                        ('debug', 'mochitest-devtools-chrome-1'): (3, 1800),
+                                                                        ('debug', 'mochitest-devtools-chrome-2'): (3, 1800),
+                                                                        ('debug', 'mochitest-devtools-chrome-3'): (3, 1800),
+                                                                        ('debug', 'mochitest-devtools-chrome-4'): (3, 1800),
+                                                                        ('debug', 'mochitest-gl'): (3, 1800),
+                                                                        ('debug', 'mochitest-other'): (3, 1800),
+                                                                        ('opt', 'cppunit'): (3, 1800),
+                                                                        ('opt', 'crashtest'): (3, 1800),
+                                                                        ('opt', 'jittest'): (3, 1800),
+                                                                        ('opt', 'jsreftest'): (3, 1800),
+                                                                        ('opt', 'marionette'): (3, 1800),
+                                                                        ('opt', 'mochitest-1'): (3, 1800),
+                                                                        ('opt', 'mochitest-2'): (3, 1800),
+                                                                        ('opt', 'mochitest-3'): (3, 1800),
+                                                                        ('opt', 'mochitest-4'): (3, 1800),
+                                                                        ('opt', 'mochitest-5'): (3, 1800),
+                                                                        ('opt', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                        ('opt', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                        ('opt', 'mochitest-devtools-chrome'): (3, 1800),
+                                                                        ('opt', 'mochitest-gl'): (3, 1800),
+                                                                        ('opt', 'mochitest-jetpack'): (3, 1800),
+                                                                        ('opt', 'mochitest-other'): (3, 1800),
+                                                                        ('opt', 'reftest'): (3, 1800),
+                                                                        ('opt', 'web-platform-tests-1'): (3, 1800),
+                                                                        ('opt', 'web-platform-tests-2'): (3, 1800),
+                                                                        ('opt', 'web-platform-tests-3'): (3, 1800),
+                                                                        ('opt', 'web-platform-tests-4'): (3, 1800),
+                                                                        ('opt', 'xpcshell'): (3, 1800),
+                                                                        }
+    BRANCHES['mozilla-inbound']['platforms']['win32']['xp-ix']['skipconfig'] = {('debug', 'crashtest'): (3, 1800),
+                                                                                ('debug', 'jsreftest'): (3, 1800),
+                                                                                ('debug', 'marionette'): (3, 1800),
+                                                                                ('debug', 'mochitest-1'): (3, 1800),
+                                                                                ('debug', 'mochitest-2'): (3, 1800),
+                                                                                ('debug', 'mochitest-3'): (3, 1800),
+                                                                                ('debug', 'mochitest-4'): (3, 1800),
+                                                                                ('debug', 'mochitest-5'): (3, 1800),
+                                                                                ('debug', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                ('debug', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                                ('debug', 'mochitest-devtools-chrome-1'): (3, 1800),
+                                                                                ('debug', 'mochitest-devtools-chrome-2'): (3, 1800),
+                                                                                ('debug', 'mochitest-devtools-chrome-3'): (3, 1800),
+                                                                                ('debug', 'mochitest-devtools-chrome-4'): (3, 1800),
+                                                                                ('debug', 'mochitest-gl'): (3, 1800),
+                                                                                ('debug', 'mochitest-other'): (3, 1800),
+                                                                                ('opt', 'cppunit'): (3, 1800),
+                                                                                ('opt', 'crashtest'): (3, 1800),
+                                                                                ('opt', 'jittest'): (3, 1800),
+                                                                                ('opt', 'jsreftest'): (3, 1800),
+                                                                                ('opt', 'marionette'): (3, 1800),
+                                                                                ('opt', 'mochitest-1'): (3, 1800),
+                                                                                ('opt', 'mochitest-2'): (3, 1800),
+                                                                                ('opt', 'mochitest-3'): (3, 1800),
+                                                                                ('opt', 'mochitest-4'): (3, 1800),
+                                                                                ('opt', 'mochitest-5'): (3, 1800),
+                                                                                ('opt', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                                ('opt', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                ('opt', 'mochitest-devtools-chrome'): (3, 1800),
+                                                                                ('opt', 'mochitest-gl'): (3, 1800),
+                                                                                ('opt', 'mochitest-jetpack'): (3, 1800),
+                                                                                ('opt', 'mochitest-other'): (3, 1800),
+                                                                                ('opt', 'reftest'): (3, 1800),
+                                                                                ('opt', 'web-platform-tests-1'): (3, 1800),
+                                                                                ('opt', 'web-platform-tests-2'): (3, 1800),
+                                                                                ('opt', 'web-platform-tests-3'): (3, 1800),
+                                                                                ('opt', 'web-platform-tests-4'): (3, 1800),
+                                                                                ('opt', 'web-platform-tests-reftests'): (3, 1800),
+                                                                                ('opt', 'xpcshell'): (3, 1800),
+                                                                                }
+    BRANCHES['fx-team']['platforms']['win64']['win8_64']['skipconfig'] = {('debug', 'cpunittest'): (3, 1800),
+                                                                          ('debug', 'cppunit'): (3, 1800),
+                                                                          ('debug', 'crashtest'): (3, 1800),
+                                                                          ('debug', 'jittest'): (3, 1800),
+                                                                          ('debug', 'jsreftest'): (3, 1800),
+                                                                          ('debug', 'marionette'): (3, 1800),
+                                                                          ('debug', 'mochitest-1'): (3, 1800),
+                                                                          ('debug', 'mochitest-2'): (3, 1800),
+                                                                          ('debug', 'mochitest-3'): (3, 1800),
+                                                                          ('debug', 'mochitest-4'): (3, 1800),
+                                                                          ('debug', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                          ('debug', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                          ('debug', 'mochitest-devtools-chrome-2'): (3, 1800),
+                                                                          ('debug', 'mochitest-devtools-chrome-4'): (3, 1800),
+                                                                          ('debug', 'mochitest-gl'): (3, 1800),
+                                                                          ('debug', 'reftest'): (3, 1800),
+                                                                          ('debug', 'xpcshell'): (3, 1800),
+                                                                          ('opt', 'cppunit'): (3, 1800),
+                                                                          ('opt', 'crashtest'): (3, 1800),
+                                                                          ('opt', 'jsreftest'): (3, 1800),
+                                                                          ('opt', 'marionette'): (3, 1800),
+                                                                          ('opt', 'mochitest-2'): (3, 1800),
+                                                                          ('opt', 'mochitest-3'): (3, 1800),
+                                                                          ('opt', 'mochitest-5'): (3, 1800),
+                                                                          ('opt', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                          ('opt', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                          ('opt', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                          ('opt', 'mochitest-e10s-browser-chrome-1'): (3, 1800),
+                                                                          ('opt', 'mochitest-e10s-browser-chrome-2'): (3, 1800),
+                                                                          ('opt', 'mochitest-e10s-browser-chrome-3'): (3, 1800),
+                                                                          ('opt', 'mochitest-gl'): (3, 1800),
+                                                                          ('opt', 'reftest-no-accel'): (3, 1800),
+                                                                          ('opt', 'web-platform-tests-2'): (3, 1800),
+                                                                          ('opt', 'web-platform-tests-3'): (3, 1800),
+                                                                          ('opt', 'web-platform-tests-4'): (3, 1800),
+                                                                          ('opt', 'web-platform-tests-reftests'): (3, 1800),
+                                                                          ('opt', 'xpcshell'): (3, 1800),   
+                                                                          }
+    BRANCHES['mozilla-inbound']['platforms']['win64']['win8_64']['skipconfig'] = {('debug', 'cppunit'): (3, 1800),
+                                                                                  ('debug', 'crashtest'): (3, 1800),
+                                                                                  ('debug', 'jittest'): (3, 1800),
+                                                                                  ('debug', 'jsreftest'): (3, 1800),
+                                                                                  ('debug', 'marionette'): (3, 1800),
+                                                                                  ('debug', 'mochitest-1'): (3, 1800),
+                                                                                  ('debug', 'mochitest-2'): (3, 1800),
+                                                                                  ('debug', 'mochitest-3'): (3, 1800),
+                                                                                  ('debug', 'mochitest-4'): (3, 1800),
+                                                                                  ('debug', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                                  ('debug', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                  ('debug', 'mochitest-devtools-chrome-1'): (3, 1800),
+                                                                                  ('debug', 'mochitest-devtools-chrome-2'): (3, 1800),
+                                                                                  ('debug', 'mochitest-devtools-chrome-4'): (3, 1800),
+                                                                                  ('debug', 'mochitest-gl'): (3, 1800),
+                                                                                  ('debug', 'reftest'): (3, 1800),
+                                                                                  ('debug', 'xpcshell'): (3, 1800),
+                                                                                  ('opt', 'cppunit'): (3, 1800),
+                                                                                  ('opt', 'crashtest'): (3, 1800),
+                                                                                  ('opt', 'jsreftest'): (3, 1800),
+                                                                                  ('opt', 'marionette'): (3, 1800),
+                                                                                  ('opt', 'mochitest-2'): (3, 1800),
+                                                                                  ('opt', 'mochitest-3'): (3, 1800),
+                                                                                  ('opt', 'mochitest-5'): (3, 1800),
+                                                                                  ('opt', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                                  ('opt', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                  ('opt', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                                  ('opt', 'mochitest-e10s-browser-chrome-1'): (3, 1800),
+                                                                                  ('opt', 'mochitest-e10s-browser-chrome-2'): (3, 1800),
+                                                                                  ('opt', 'mochitest-e10s-browser-chrome-3'): (3, 1800),
+                                                                                  ('opt', 'mochitest-gl'): (3, 1800),
+                                                                                  ('opt', 'reftest-no-accel'): (3, 1800),
+                                                                                  ('opt', 'web-platform-tests-2'): (3, 1800),
+                                                                                  ('opt', 'web-platform-tests-3'): (3, 1800),
+                                                                                  ('opt', 'web-platform-tests-4'): (3, 1800),
+                                                                                  ('opt', 'web-platform-tests-reftests'): (3, 1800),
+                                                                                  ('opt', 'xpcshell'): (3, 1800),
+                                                                                  }
+    BRANCHES['fx-team']['platforms']['win32']['win7-ix']['skipconfig'] = { ('debug', 'jittest'): (3, 1800),
+                                                                           ('debug', 'jsreftest'): (3, 1800),
+                                                                           ('debug', 'marionette'): (3, 1800),
+                                                                           ('debug', 'mochitest-1'): (3, 1800),
+                                                                           ('debug', 'mochitest-4'): (3, 1800),
+                                                                           ('debug', 'mochitest-5'): (3, 1800),
+                                                                           ('debug', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                           ('debug', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                           ('debug', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                           ('debug', 'mochitest-devtools-chrome-1'): (3, 1800),
+                                                                           ('debug', 'mochitest-devtools-chrome-2'): (3, 1800),
+                                                                           ('debug', 'mochitest-devtools-chrome-3'): (3, 1800),
+                                                                           ('debug', 'mochitest-gl'): (3, 1800),
+                                                                           ('debug', 'mochitest-other'): (3, 1800),
+                                                                           ('debug', 'reftest'): (3, 1800),
+                                                                           ('debug', 'xpcshell'): (3, 1800),
+                                                                           ('opt', 'cppunit'): (3, 1800),
+                                                                           ('opt', 'crashtest'): (3, 1800),
+                                                                           ('opt', 'jittest'): (3, 1800),
+                                                                           ('opt', 'jsreftest'): (3, 1800),
+                                                                           ('opt', 'mochitest-1'): (3, 1800),
+                                                                           ('opt', 'mochitest-3'): (3, 1800),
+                                                                           ('opt', 'mochitest-4'): (3, 1800),
+                                                                           ('opt', 'mochitest-5'): (3, 1800),
+                                                                           ('opt', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                           ('opt', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                           ('opt', 'mochitest-devtools-chrome'): (3, 1800),
+                                                                           ('opt', 'mochitest-e10s-browser-chrome-1'): (3, 1800),
+                                                                           ('opt', 'mochitest-e10s-browser-chrome-2'): (3, 1800),
+                                                                           ('opt', 'mochitest-e10s-browser-chrome-3'): (3, 1800),
+                                                                           ('opt', 'mochitest-gl'): (3, 1800),
+                                                                           ('opt', 'mochitest-jetpack'): (3, 1800),
+                                                                           ('opt', 'mochitest-other'): (3, 1800),
+                                                                           ('opt', 'reftest'): (3, 1800),
+                                                                           ('opt', 'web-platform-tests-1'): (3, 1800),
+                                                                           ('opt', 'web-platform-tests-3'): (3, 1800),
+                                                                           ('opt', 'web-platform-tests-reftests'): (3, 1800),
+                                                                           }
+    BRANCHES['mozilla-inbound']['platforms']['win32']['win7-ix']['skipconfig'] = {('debug', 'jittest'): (3, 1800),
+                                                                                  ('debug', 'jsreftest'): (3, 1800),
+                                                                                  ('debug', 'marionette'): (3, 1800),
+                                                                                  ('debug', 'mochitest-1'): (3, 1800),
+                                                                                  ('debug', 'mochitest-4'): (3, 1800),
+                                                                                  ('debug', 'mochitest-5'): (3, 1800),
+                                                                                  ('debug', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                                  ('debug', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                  ('debug', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                                  ('debug', 'mochitest-devtools-chrome-1'): (3, 1800),
+                                                                                  ('debug', 'mochitest-devtools-chrome-2'): (3, 1800),
+                                                                                  ('debug', 'mochitest-devtools-chrome-3'): (3, 1800),
+                                                                                  ('debug', 'mochitest-gl'): (3, 1800),
+                                                                                  ('debug', 'mochitest-other'): (3, 1800),
+                                                                                  ('debug', 'reftest'): (3, 1800),
+                                                                                  ('debug', 'xpcshell'): (3, 1800),
+                                                                                  ('opt', 'cppunit'): (3, 1800),
+                                                                                  ('opt', 'crashtest'): (3, 1800),
+                                                                                  ('opt', 'jittest'): (3, 1800),
+                                                                                  ('opt', 'jsreftest'): (3, 1800),
+                                                                                  ('opt', 'mochitest-1'): (3, 1800),
+                                                                                  ('opt', 'mochitest-3'): (3, 1800),
+                                                                                  ('opt', 'mochitest-4'): (3, 1800),
+                                                                                  ('opt', 'mochitest-5'): (3, 1800),
+                                                                                  ('opt', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                  ('opt', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                                  ('opt', 'mochitest-devtools-chrome'): (3, 1800),
+                                                                                  ('opt', 'mochitest-e10s-browser-chrome-1'): (3, 1800),
+                                                                                  ('opt', 'mochitest-e10s-browser-chrome-2'): (3, 1800),
+                                                                                  ('opt', 'mochitest-e10s-browser-chrome-3'): (3, 1800),
+                                                                                  ('opt', 'mochitest-gl'): (3, 1800),
+                                                                                  ('opt', 'mochitest-jetpack'): (3, 1800),
+                                                                                  ('opt', 'mochitest-other'): (3, 1800),
+                                                                                  ('opt', 'reftest'): (3, 1800),
+                                                                                  ('opt', 'web-platform-tests-1'): (3, 1800),
+                                                                                  ('opt', 'web-platform-tests-3'): (3, 1800),
+                                                                                  ('opt', 'web-platform-tests-reftests'): (3, 1800),
+                                                                                  }
+    BRANCHES['fx-team']['platforms']['macosx64']['snowleopard']['skipconfig'] = {('debug', 'cppunit'): (3, 1800),
+                                                                                 ('debug', 'crashtest'): (3, 1800),
+                                                                                 ('debug', 'jittest'): (3, 1800),
+                                                                                 ('debug', 'jsreftest'): (3, 1800),
+                                                                                 ('debug', 'marionette'): (3, 1800),
+                                                                                 ('debug', 'mochitest-1'): (3, 1800),
+                                                                                 ('debug', 'mochitest-2'): (3, 1800),
+                                                                                 ('debug', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                 ('debug', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                                 ('debug', 'mochitest-devtools-chrome-1'): (3, 1800),
+                                                                                 ('debug', 'mochitest-devtools-chrome-2'): (3, 1800),
+                                                                                 ('debug', 'mochitest-devtools-chrome-3'): (3, 1800),
+                                                                                 ('debug', 'mochitest-devtools-chrome-4'): (3, 1800),
+                                                                                 ('debug', 'mochitest-gl'): (3, 1800),
+                                                                                 ('debug', 'mochitest-other'): (3, 1800),
+                                                                                 ('debug', 'reftest'): (3, 1800),
+                                                                                 ('debug', 'xpcshell'): (3, 1800),
+                                                                                 ('opt', 'cppunit'): (3, 1800),
+                                                                                 ('opt', 'crashtest'): (3, 1800),
+                                                                                 ('opt', 'jittest'): (3, 1800),
+                                                                                 ('opt', 'jsreftest'): (3, 1800),
+                                                                                 ('opt', 'mochitest-1'): (3, 1800),
+                                                                                 ('opt', 'mochitest-2'): (3, 1800),
+                                                                                 ('opt', 'mochitest-3'): (3, 1800),
+                                                                                 ('opt', 'mochitest-4'): (3, 1800),
+                                                                                 ('opt', 'mochitest-5'): (3, 1800),
+                                                                                 ('opt', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                                 ('opt', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                 ('opt', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                                 ('opt', 'mochitest-devtools-chrome'): (3, 1800),
+                                                                                 ('opt', 'mochitest-e10s-browser-chrome-1'): (3, 1800),
+                                                                                 ('opt', 'mochitest-e10s-browser-chrome-2'): (3, 1800),
+                                                                                 ('opt', 'mochitest-e10s-browser-chrome-3'): (3, 1800),
+                                                                                 ('opt', 'mochitest-gl'): (3, 1800),
+                                                                                 ('opt', 'mochitest-jetpack'): (3, 1800),
+                                                                                 ('opt', 'xpcshell'): (3, 1800),
+                                                                                 }
+    BRANCHES['mozilla-inbound']['platforms']['macosx64']['snowleopard']['skipconfig'] = {('debug', 'cppunit'): (3, 1800),
+                                                                                         ('debug', 'crashtest'): (3, 1800),
+                                                                                         ('debug', 'jittest'): (3, 1800),
+                                                                                         ('debug', 'jsreftest'): (3, 1800),
+                                                                                         ('debug', 'marionette'): (3, 1800),
+                                                                                         ('debug', 'mochitest-1'): (3, 1800),
+                                                                                         ('debug', 'mochitest-2'): (3, 1800),
+                                                                                         ('debug', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                         ('debug', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                                         ('debug', 'mochitest-devtools-chrome-1'): (3, 1800),
+                                                                                         ('debug', 'mochitest-devtools-chrome-2'): (3, 1800),
+                                                                                         ('debug', 'mochitest-devtools-chrome-3'): (3, 1800),
+                                                                                         ('debug', 'mochitest-devtools-chrome-4'): (3, 1800),
+                                                                                         ('debug', 'mochitest-gl'): (3, 1800),
+                                                                                         ('debug', 'mochitest-other'): (3, 1800),
+                                                                                         ('debug', 'reftest'): (3, 1800),
+                                                                                         ('debug', 'xpcshell'): (3, 1800),
+                                                                                         ('opt', 'cppunit'): (3, 1800),
+                                                                                         ('opt', 'crashtest'): (3, 1800),
+                                                                                         ('opt', 'jittest'): (3, 1800),
+                                                                                         ('opt', 'jsreftest'): (3, 1800),
+                                                                                         ('opt', 'mochitest-1'): (3, 1800),
+                                                                                         ('opt', 'mochitest-2'): (3, 1800),
+                                                                                         ('opt', 'mochitest-3'): (3, 1800),
+                                                                                         ('opt', 'mochitest-4'): (3, 1800),
+                                                                                         ('opt', 'mochitest-5'): (3, 1800),
+                                                                                         ('opt', 'mochitest-browser-chrome-1'): (3, 1800),
+                                                                                         ('opt', 'mochitest-browser-chrome-2'): (3, 1800),
+                                                                                         ('opt', 'mochitest-browser-chrome-3'): (3, 1800),
+                                                                                         ('opt', 'mochitest-devtools-chrome'): (3, 1800),
+                                                                                         ('opt', 'mochitest-e10s-browser-chrome-1'): (3, 1800),
+                                                                                         ('opt', 'mochitest-e10s-browser-chrome-2'): (3, 1800),
+                                                                                         ('opt', 'mochitest-e10s-browser-chrome-3'): (3, 1800),
+                                                                                         ('opt', 'mochitest-gl'): (3, 1800),
+                                                                                         ('opt', 'mochitest-jetpack'): (3, 1800),
+                                                                                         ('opt', 'xpcshell'): (3, 1800),
+                                                                                         }
+    BRANCHES['fx-team']['platforms']['linux']['ubuntu32_vm']['skipconfig'] = {('debug', 'cppunit'): (2, 1800),
+                                                                              ('debug', 'crashtest'): (2, 1800),
+                                                                              ('debug', 'jittest-1'): (2, 1800),
+                                                                              ('debug', 'jittest-2'): (2, 1800),
+                                                                              ('debug', 'jsreftest'): (2, 1800),
+                                                                              ('debug', 'marionette'): (2, 1800),
+                                                                              ('debug', 'mochitest-1'): (2, 1800),
+                                                                              ('debug', 'mochitest-3'): (2, 1800),
+                                                                              ('debug', 'mochitest-4'): (2, 1800),
+                                                                              ('debug', 'mochitest-5'): (2, 1800),
+                                                                              ('debug', 'mochitest-browser-chrome-2'): (2, 1800),
+                                                                              ('debug', 'mochitest-browser-chrome-3'): (2, 1800),
+                                                                              ('debug', 'mochitest-devtools-chrome-1'): (2, 1800),
+                                                                              ('debug', 'mochitest-devtools-chrome-2'): (2, 1800),
+                                                                              ('debug', 'mochitest-devtools-chrome-4'): (2, 1800),
+                                                                              ('debug', 'mochitest-e10s-1'): (2, 1800),
+                                                                              ('debug', 'mochitest-e10s-2'): (2, 1800),
+                                                                              ('debug', 'mochitest-e10s-3'): (2, 1800),
+                                                                              ('debug', 'mochitest-e10s-4'): (2, 1800),
+                                                                              ('debug', 'mochitest-e10s-5'): (2, 1800),
+                                                                              ('debug', 'mochitest-gl'): (2, 1800),
+                                                                              ('debug', 'reftest'): (2, 1800),
+                                                                              ('debug', 'reftest-1'): (2, 1800),
+                                                                              ('debug', 'reftest-2'): (2, 1800),
+                                                                              ('debug', 'xpcshell'): (2, 1800),
+                                                                              ('opt', 'cppunit'): (2, 1800),
+                                                                              ('opt', 'crashtest'): (2, 1800),
+                                                                              ('opt', 'crashtest-e10s'): (2, 1800),
+                                                                              ('opt', 'jittest-1'): (2, 1800),
+                                                                              ('opt', 'jittest-2'): (2, 1800),
+                                                                              ('opt', 'jsreftest'): (2, 1800),
+                                                                              ('opt', 'marionette'): (2, 1800),
+                                                                              ('opt', 'marionette-e10s'): (2, 1800),
+                                                                              ('opt', 'mochitest-1'): (2, 1800),
+                                                                              ('opt', 'mochitest-2'): (2, 1800),
+                                                                              ('opt', 'mochitest-3'): (2, 1800),
+                                                                              ('opt', 'mochitest-4'): (2, 1800),
+                                                                              ('opt', 'mochitest-5'): (2, 1800),
+                                                                              ('opt', 'mochitest-browser-chrome-1'): (2, 1800),
+                                                                              ('opt', 'mochitest-browser-chrome-2'): (2, 1800),
+                                                                              ('opt', 'mochitest-browser-chrome-3'): (2, 1800),
+                                                                              ('opt', 'mochitest-devtools-chrome'): (2, 1800),
+                                                                              ('opt', 'mochitest-e10s-1'): (2, 1800),
+                                                                              ('opt', 'mochitest-e10s-2'): (2, 1800),
+                                                                              ('opt', 'mochitest-e10s-3'): (2, 1800),
+                                                                              ('opt', 'mochitest-e10s-4'): (2, 1800),
+                                                                              ('opt', 'mochitest-e10s-5'): (2, 1800),
+                                                                              ('opt', 'mochitest-e10s-browser-chrome-2'): (2, 1800),
+                                                                              ('opt', 'mochitest-e10s-browser-chrome-3'): (2, 1800),
+                                                                              ('opt', 'mochitest-gl'): (2, 1800),
+                                                                              ('opt', 'mochitest-jetpack'): (2, 1800),
+                                                                              ('opt', 'mochitest-other'): (2, 1800),
+                                                                              ('opt', 'reftest-1'): (2, 1800),
+                                                                              ('opt', 'reftest-2'): (2, 1800),
+                                                                              ('opt', 'reftest-e10s'): (2, 1800),
+                                                                              ('opt', 'reftest-no-accel'): (2, 1800),
+                                                                              ('opt', 'web-platform-tests-1'): (2, 1800),
+                                                                              ('opt', 'web-platform-tests-3'): (2, 1800),
+                                                                              ('opt', 'web-platform-tests-4'): (2, 1800),
+                                                                              ('opt', 'web-platform-tests-reftests'): (2, 1800),
+                                                                              ('opt', 'xpcshell'): (2, 1800)
+                                                                              }
+    BRANCHES['mozilla-inbound']['platforms']['linux']['ubuntu32_vm']['skipconfig'] = {('debug', 'crashtest'): (2, 1800),
+                                                                                     ('debug', 'jittest-1'): (2, 1800),
+                                                                                     ('debug', 'jittest-2'): (2, 1800),
+                                                                                     ('debug', 'jsreftest'): (2, 1800),
+                                                                                     ('debug', 'mochitest-1'): (2, 1800),
+                                                                                     ('debug', 'mochitest-3'): (2, 1800),
+                                                                                     ('debug', 'mochitest-4'): (2, 1800),
+                                                                                     ('debug', 'mochitest-browser-chrome-2'): (2, 1800),
+                                                                                     ('debug', 'mochitest-browser-chrome-3'): (2, 1800),
+                                                                                     ('debug', 'mochitest-devtools-chrome-4'): (2, 1800),
+                                                                                     ('debug', 'mochitest-e10s-1'): (2, 1800),
+                                                                                     ('debug', 'mochitest-e10s-2'): (2, 1800),
+                                                                                     ('debug', 'mochitest-e10s-3'): (2, 1800),
+                                                                                     ('debug', 'mochitest-e10s-4'): (2, 1800),
+                                                                                     ('debug', 'mochitest-e10s-5'): (2, 1800),
+                                                                                     ('debug', 'mochitest-gl'): (2, 1800),
+                                                                                     ('debug', 'reftest-1'): (2, 1800),
+                                                                                     ('debug', 'reftest-2'): (2, 1800),
+                                                                                     ('debug', 'xpcshell'): (2, 1800),
+                                                                                     ('opt', 'cppunit'): (2, 1800),
+                                                                                     ('opt', 'crashtest'): (2, 1800),
+                                                                                     ('opt', 'crashtest-e10s'): (2, 1800),
+                                                                                     ('opt', 'jittest-1'): (2, 1800),
+                                                                                     ('opt', 'jittest-2'): (2, 1800),
+                                                                                     ('opt', 'jsreftest'): (2, 1800),
+                                                                                     ('opt', 'marionette'): (2, 1800),
+                                                                                     ('opt', 'marionette-e10s'): (2, 1800),
+                                                                                     ('opt', 'mochitest-1'): (2, 1800),
+                                                                                     ('opt', 'mochitest-2'): (2, 1800),
+                                                                                     ('opt', 'mochitest-3'): (2, 1800),
+                                                                                     ('opt', 'mochitest-4'): (2, 1800),
+                                                                                     ('opt', 'mochitest-browser-chrome-1'): (2, 1800),
+                                                                                     ('opt', 'mochitest-devtools-chrome'): (2, 1800),
+                                                                                     ('opt', 'mochitest-e10s-1'): (2, 1800),
+                                                                                     ('opt', 'mochitest-e10s-2'): (2, 1800),
+                                                                                     ('opt', 'mochitest-e10s-3'): (2, 1800),
+                                                                                     ('opt', 'mochitest-e10s-4'): (2, 1800),
+                                                                                     ('opt', 'mochitest-e10s-5'): (2, 1800),
+                                                                                     ('opt', 'mochitest-e10s-browser-chrome-2'): (2, 1800),
+                                                                                     ('opt', 'mochitest-e10s-browser-chrome-3'): (2, 1800),
+                                                                                     ('opt', 'mochitest-gl'): (2, 1800),
+                                                                                     ('opt', 'mochitest-jetpack'): (2, 1800),
+                                                                                     ('opt', 'mochitest-other'): (2, 1800),
+                                                                                     ('opt', 'reftest-1'): (2, 1800),
+                                                                                     ('opt', 'reftest-2'): (2, 1800),
+                                                                                     ('opt', 'reftest-e10s'): (2, 1800),
+                                                                                     ('opt', 'reftest-no-accel'): (2, 1800),
+                                                                                     ('opt', 'web-platform-tests-1'): (2, 1800),
+                                                                                     ('opt', 'web-platform-tests-3'): (2, 1800),
+                                                                                     ('opt', 'xpcshell'): (2, 1800),
+                                                                                     }
+    BRANCHES['fx-team']['platforms']['macosx64']['yosemite']['skipconfig'] = {('debug', 'mochitest-1'): (2, 1800),
+                                                                              ('debug', 'mochitest-2'): (2, 1800),
+                                                                              ('debug', 'mochitest-3'): (2, 1800),
+                                                                              ('debug', 'mochitest-4'): (2, 1800),
+                                                                              ('debug', 'mochitest-5'): (2, 1800),
+                                                                              ('debug', 'mochitest-browser-chrome-1 '): (2, 1800),
+                                                                              ('debug', 'mochitest-browser-chrome-2 '): (2, 1800),
+                                                                              ('debug', 'mochitest-browser-chrome-3 '): (2, 1800),
+                                                                              ('debug', 'mochitest-other'): (2, 1800),
+                                                                              ('debug', 'reftest'): (2, 1800),
+                                                                              ('debug', 'jsreftest'): (2, 1800),
+                                                                              ('debug', 'crashtest'): (2, 1800),
+                                                                              ('debug', 'xpcshell'): (2, 1800),
+                                                                              ('debug', 'marionette'): (2, 1800),
+                                                                              ('debug', 'mochitest-devtools-chrome-1'): (2, 1800),
+                                                                              ('debug', 'mochitest-devtools-chrome-2'): (2, 1800),
+                                                                              ('debug', 'mochitest-devtools-chrome-3'): (2, 1800),
+                                                                              ('debug', 'mochitest-devtools-chrome-4'): (2, 1800),
+                                                                              ('debug', 'mochitest-jetpack'): (2, 1800),
+                                                                              ('debug', 'mochitest-gl'): (2, 1800),
+                                                                              }
+    BRANCHES['mozilla-inbound']['platforms']['macosx64']['yosemite']['skipconfig'] = {('debug', 'mochitest-1'): (2, 1800),
+                                                                                      ('debug', 'mochitest-2'): (2, 1800),
+                                                                                      ('debug', 'mochitest-3'): (2, 1800),
+                                                                                      ('debug', 'mochitest-4'): (2, 1800),
+                                                                                      ('debug', 'mochitest-5'): (2, 1800),
+                                                                                      ('debug', 'mochitest-browser-chrome-1 '): (2, 1800),
+                                                                                      ('debug', 'mochitest-browser-chrome-2 '): (2, 1800),
+                                                                                      ('debug', 'mochitest-browser-chrome-3 '): (2, 1800),
+                                                                                      ('debug', 'mochitest-other'): (2, 1800),
+                                                                                      ('debug', 'reftest'): (2, 1800),
+                                                                                      ('debug', 'jsreftest'): (2, 1800),
+                                                                                      ('debug', 'crashtest'): (2, 1800),
+                                                                                      ('debug', 'xpcshell'): (2, 1800),
+                                                                                      ('debug', 'marionette'): (2, 1800),
+                                                                                      ('debug', 'mochitest-devtools-chrome-1'): (2, 1800),
+                                                                                      ('debug', 'mochitest-devtools-chrome-2'): (2, 1800),
+                                                                                      ('debug', 'mochitest-devtools-chrome-3'): (2, 1800),
+                                                                                      ('debug', 'mochitest-devtools-chrome-4'): (2, 1800),
+                                                                                      ('debug', 'mochitest-jetpack'): (2, 1800),
+                                                                                      ('debug', 'mochitest-gl'): (2, 1800),
+                                                                                      }
\ No newline at end of file