--- a/mozilla-tests/config_seta.py
+++ b/mozilla-tests/config_seta.py
@@ -1,58 +1,10 @@
-######## 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']['win64']['win8_64']['skipconfig'] = {
- ('debug', 'cppunit'): (10, 5400),
- ('debug', 'crashtest'): (10, 5400),
- ('debug', 'jittest'): (10, 5400),
- ('debug', 'jsreftest'): (10, 5400),
- ('debug', 'marionette'): (10, 5400),
- ('debug', 'mochitest-1'): (10, 5400),
- ('debug', 'mochitest-2'): (10, 5400),
- ('debug', 'mochitest-3'): (10, 5400),
- ('debug', 'mochitest-4'): (10, 5400),
- ('debug', 'mochitest-5'): (10, 5400),
- ('debug', 'mochitest-browser-chrome-1'): (10, 5400),
- ('debug', 'mochitest-browser-chrome-2'): (10, 5400),
- ('debug', 'mochitest-browser-chrome-3'): (10, 5400),
- ('debug', 'mochitest-devtools-chrome-1'): (10, 5400),
- ('debug', 'mochitest-devtools-chrome-2'): (10, 5400),
- ('debug', 'mochitest-devtools-chrome-4'): (10, 5400),
- ('debug', 'mochitest-gl'): (10, 5400),
- ('debug', 'mochitest-jetpack'): (10, 5400),
- ('debug', 'mochitest-other'): (10, 5400),
- ('debug', 'reftest'): (10, 5400),
- ('opt', 'cppunit'): (10, 5400),
- ('opt', 'crashtest'): (10, 5400),
- ('opt', 'jsreftest'): (10, 5400),
- ('opt', 'marionette'): (10, 5400),
- ('opt', 'mochitest-1'): (10, 5400),
- ('opt', 'mochitest-2'): (10, 5400),
- ('opt', 'mochitest-3'): (10, 5400),
- ('opt', 'mochitest-4'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-1'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-3'): (10, 5400),
- ('opt', 'mochitest-devtools-chrome'): (10, 5400),
- ('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
- ('opt', 'mochitest-e10s-browser-chrome-3'): (10, 5400),
- ('opt', 'mochitest-gl'): (10, 5400),
- ('opt', 'reftest-no-accel'): (10, 5400),
- ('opt', 'web-platform-tests-2'): (10, 5400),
- ('opt', 'web-platform-tests-3'): (10, 5400),
- ('opt', 'web-platform-tests-4'): (10, 5400),
- ('opt', 'web-platform-tests-reftests'): (10, 5400),
- ('opt', 'xpcshell'): (10, 5400),
- }
BRANCHES['fx-team']['platforms']['linux64']['ubuntu64_vm']['skipconfig'] = {
('debug', 'cppunit'): (10, 5400),
('debug', 'jittest-1'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'marionette'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
('debug', 'mochitest-4'): (10, 5400),
('debug', 'mochitest-5'): (10, 5400),
@@ -83,48 +35,26 @@ def loadSkipConfig(BRANCHES):
('opt', 'mochitest-2'): (10, 5400),
('opt', 'mochitest-4'): (10, 5400),
('opt', 'mochitest-browser-chrome-1'): (10, 5400),
('opt', 'mochitest-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-browser-chrome-3'): (10, 5400),
('opt', 'mochitest-devtools-chrome'): (10, 5400),
('opt', 'mochitest-e10s-1'): (10, 5400),
('opt', 'mochitest-e10s-2'): (10, 5400),
- ('opt', 'mochitest-e10s-4'): (10, 5400),
('opt', 'mochitest-e10s-5'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-gl'): (10, 5400),
('opt', 'mochitest-jetpack'): (10, 5400),
('opt', 'reftest'): (10, 5400),
('opt', 'web-platform-tests-1'): (10, 5400),
+ ('opt', 'web-platform-tests-2'): (10, 5400),
('opt', 'web-platform-tests-3'): (10, 5400),
('opt', 'xpcshell'): (10, 5400),
}
- BRANCHES['fx-team']['platforms']['linux64-asan']['ubuntu64-asan_vm']['skipconfig'] = {
- ('opt', 'cppunit'): (10, 5400),
- ('opt', 'crashtest'): (10, 5400),
- ('opt', 'jittest-1'): (10, 5400),
- ('opt', 'jittest-2'): (10, 5400),
- ('opt', 'jsreftest'): (10, 5400),
- ('opt', 'mochitest-1'): (10, 5400),
- ('opt', 'mochitest-2'): (10, 5400),
- ('opt', 'mochitest-4'): (10, 5400),
- ('opt', 'mochitest-5'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-1'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-2'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-3'): (10, 5400),
- ('opt', 'mochitest-devtools-chrome'): (10, 5400),
- ('opt', 'mochitest-e10s-2'): (10, 5400),
- ('opt', 'mochitest-e10s-3'): (10, 5400),
- ('opt', 'mochitest-e10s-5'): (10, 5400),
- ('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
- ('opt', 'mochitest-gl'): (10, 5400),
- ('opt', 'mochitest-jetpack'): (10, 5400),
- ('opt', 'mochitest-other'): (10, 5400),
- }
BRANCHES['fx-team']['platforms']['linux']['ubuntu32_vm']['skipconfig'] = {
('debug', 'crashtest'): (10, 5400),
('debug', 'jittest-1'): (10, 5400),
('debug', 'jittest-2'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
('debug', 'mochitest-3'): (10, 5400),
('debug', 'mochitest-4'): (10, 5400),
@@ -171,17 +101,16 @@ def loadSkipConfig(BRANCHES):
('opt', 'mochitest-gl'): (10, 5400),
('opt', 'mochitest-jetpack'): (10, 5400),
('opt', 'mochitest-other'): (10, 5400),
('opt', 'reftest-1'): (10, 5400),
('opt', 'reftest-2'): (10, 5400),
('opt', 'reftest-e10s'): (10, 5400),
('opt', 'reftest-no-accel'): (10, 5400),
('opt', 'web-platform-tests-1'): (10, 5400),
- ('opt', 'web-platform-tests-3'): (10, 5400),
('opt', 'web-platform-tests-4'): (10, 5400),
('opt', 'web-platform-tests-reftests'): (10, 5400),
('debug', 'cppunit'): (10, 5400),
('debug', 'jittest-1'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'marionette'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
('debug', 'mochitest-4'): (10, 5400),
@@ -213,23 +142,23 @@ def loadSkipConfig(BRANCHES):
('opt', 'mochitest-2'): (10, 5400),
('opt', 'mochitest-4'): (10, 5400),
('opt', 'mochitest-browser-chrome-1'): (10, 5400),
('opt', 'mochitest-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-browser-chrome-3'): (10, 5400),
('opt', 'mochitest-devtools-chrome'): (10, 5400),
('opt', 'mochitest-e10s-1'): (10, 5400),
('opt', 'mochitest-e10s-2'): (10, 5400),
- ('opt', 'mochitest-e10s-4'): (10, 5400),
('opt', 'mochitest-e10s-5'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-gl'): (10, 5400),
('opt', 'mochitest-jetpack'): (10, 5400),
('opt', 'reftest'): (10, 5400),
('opt', 'web-platform-tests-1'): (10, 5400),
+ ('opt', 'web-platform-tests-2'): (10, 5400),
('opt', 'web-platform-tests-3'): (10, 5400),
('opt', 'xpcshell'): (10, 5400),
}
BRANCHES['fx-team']['platforms']['win32']['win7-ix']['skipconfig'] = {
('debug', 'jittest'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'marionette'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
@@ -282,17 +211,16 @@ def loadSkipConfig(BRANCHES):
('debug', 'mochitest-browser-chrome-2'): (10, 5400),
('debug', 'mochitest-browser-chrome-3'): (10, 5400),
('debug', 'mochitest-devtools-chrome-1'): (10, 5400),
('debug', 'mochitest-devtools-chrome-2'): (10, 5400),
('debug', 'mochitest-devtools-chrome-3'): (10, 5400),
('debug', 'mochitest-devtools-chrome-4'): (10, 5400),
('debug', 'mochitest-gl'): (10, 5400),
('debug', 'mochitest-jetpack'): (10, 5400),
- ('debug', 'mochitest-other'): (10, 5400),
('opt', 'cppunit'): (10, 5400),
('opt', 'crashtest'): (10, 5400),
('opt', 'jittest'): (10, 5400),
('opt', 'jsreftest'): (10, 5400),
('opt', 'marionette'): (10, 5400),
('opt', 'mochitest-1'): (10, 5400),
('opt', 'mochitest-2'): (10, 5400),
('opt', 'mochitest-3'): (10, 5400),
@@ -351,16 +279,17 @@ def loadSkipConfig(BRANCHES):
BRANCHES['fx-team']['platforms']['macosx64']['snowleopard']['skipconfig'] = {
('debug', 'cppunit'): (10, 5400),
('debug', 'crashtest'): (10, 5400),
('debug', 'jittest'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'marionette'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
('debug', 'mochitest-2'): (10, 5400),
+ ('debug', 'mochitest-4'): (10, 5400),
('debug', 'mochitest-browser-chrome-2'): (10, 5400),
('debug', 'mochitest-browser-chrome-3'): (10, 5400),
('debug', 'mochitest-devtools-chrome-1'): (10, 5400),
('debug', 'mochitest-devtools-chrome-2'): (10, 5400),
('debug', 'mochitest-devtools-chrome-3'): (10, 5400),
('debug', 'mochitest-gl'): (10, 5400),
('debug', 'mochitest-jetpack'): (10, 5400),
('debug', 'mochitest-other'): (10, 5400),
@@ -379,58 +308,79 @@ def loadSkipConfig(BRANCHES):
('opt', 'mochitest-devtools-chrome'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-1'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-3'): (10, 5400),
('opt', 'mochitest-gl'): (10, 5400),
('opt', 'mochitest-jetpack'): (10, 5400),
('opt', 'xpcshell'): (10, 5400),
}
- BRANCHES['mozilla-inbound']['platforms']['win64']['win8_64']['skipconfig'] = {
- ('debug', 'cppunit'): (10, 5400),
- ('debug', 'crashtest'): (10, 5400),
- ('debug', 'jittest'): (10, 5400),
- ('debug', 'jsreftest'): (10, 5400),
- ('debug', 'marionette'): (10, 5400),
- ('debug', 'mochitest-1'): (10, 5400),
- ('debug', 'mochitest-2'): (10, 5400),
- ('debug', 'mochitest-3'): (10, 5400),
- ('debug', 'mochitest-4'): (10, 5400),
- ('debug', 'mochitest-5'): (10, 5400),
- ('debug', 'mochitest-browser-chrome-1'): (10, 5400),
- ('debug', 'mochitest-browser-chrome-2'): (10, 5400),
- ('debug', 'mochitest-browser-chrome-3'): (10, 5400),
- ('debug', 'mochitest-devtools-chrome-1'): (10, 5400),
- ('debug', 'mochitest-devtools-chrome-2'): (10, 5400),
- ('debug', 'mochitest-devtools-chrome-4'): (10, 5400),
- ('debug', 'mochitest-gl'): (10, 5400),
- ('debug', 'mochitest-jetpack'): (10, 5400),
- ('debug', 'mochitest-other'): (10, 5400),
- ('debug', 'reftest'): (10, 5400),
- ('opt', 'cppunit'): (10, 5400),
- ('opt', 'crashtest'): (10, 5400),
- ('opt', 'jsreftest'): (10, 5400),
- ('opt', 'marionette'): (10, 5400),
- ('opt', 'mochitest-1'): (10, 5400),
- ('opt', 'mochitest-2'): (10, 5400),
- ('opt', 'mochitest-3'): (10, 5400),
- ('opt', 'mochitest-4'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-1'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-3'): (10, 5400),
- ('opt', 'mochitest-devtools-chrome'): (10, 5400),
- ('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
- ('opt', 'mochitest-e10s-browser-chrome-3'): (10, 5400),
- ('opt', 'mochitest-gl'): (10, 5400),
- ('opt', 'reftest-no-accel'): (10, 5400),
- ('opt', 'web-platform-tests-2'): (10, 5400),
- ('opt', 'web-platform-tests-3'): (10, 5400),
- ('opt', 'web-platform-tests-4'): (10, 5400),
- ('opt', 'web-platform-tests-reftests'): (10, 5400),
- ('opt', 'xpcshell'): (10, 5400),
- }
+ BRANCHES['fx-team']['platforms']['linux64-asan']['ubuntu64-asan_vm']['skipconfig'] = {
+ ('opt', 'cppunit'): (10, 5400),
+ ('opt', 'crashtest'): (10, 5400),
+ ('opt', 'jittest-1'): (10, 5400),
+ ('opt', 'jittest-2'): (10, 5400),
+ ('opt', 'jsreftest'): (10, 5400),
+ ('opt', 'mochitest-1'): (10, 5400),
+ ('opt', 'mochitest-2'): (10, 5400),
+ ('opt', 'mochitest-4'): (10, 5400),
+ ('opt', 'mochitest-5'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-1'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-2'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-3'): (10, 5400),
+ ('opt', 'mochitest-devtools-chrome'): (10, 5400),
+ ('opt', 'mochitest-e10s-2'): (10, 5400),
+ ('opt', 'mochitest-e10s-3'): (10, 5400),
+ ('opt', 'mochitest-e10s-5'): (10, 5400),
+ ('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
+ ('opt', 'mochitest-gl'): (10, 5400),
+ ('opt', 'mochitest-jetpack'): (10, 5400),
+ ('opt', 'mochitest-other'): (10, 5400),
+ }
+ BRANCHES['fx-team']['platforms']['win64']['win8_64']['skipconfig'] = {
+ ('debug', 'cppunit'): (10, 5400),
+ ('debug', 'crashtest'): (10, 5400),
+ ('debug', 'jittest'): (10, 5400),
+ ('debug', 'jsreftest'): (10, 5400),
+ ('debug', 'marionette'): (10, 5400),
+ ('debug', 'mochitest-1'): (10, 5400),
+ ('debug', 'mochitest-2'): (10, 5400),
+ ('debug', 'mochitest-3'): (10, 5400),
+ ('debug', 'mochitest-4'): (10, 5400),
+ ('debug', 'mochitest-5'): (10, 5400),
+ ('debug', 'mochitest-browser-chrome-1'): (10, 5400),
+ ('debug', 'mochitest-browser-chrome-2'): (10, 5400),
+ ('debug', 'mochitest-browser-chrome-3'): (10, 5400),
+ ('debug', 'mochitest-devtools-chrome-1'): (10, 5400),
+ ('debug', 'mochitest-devtools-chrome-4'): (10, 5400),
+ ('debug', 'mochitest-gl'): (10, 5400),
+ ('debug', 'mochitest-jetpack'): (10, 5400),
+ ('debug', 'mochitest-other'): (10, 5400),
+ ('debug', 'reftest'): (10, 5400),
+ ('opt', 'cppunit'): (10, 5400),
+ ('opt', 'crashtest'): (10, 5400),
+ ('opt', 'jsreftest'): (10, 5400),
+ ('opt', 'marionette'): (10, 5400),
+ ('opt', 'mochitest-1'): (10, 5400),
+ ('opt', 'mochitest-2'): (10, 5400),
+ ('opt', 'mochitest-3'): (10, 5400),
+ ('opt', 'mochitest-4'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-1'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-3'): (10, 5400),
+ ('opt', 'mochitest-devtools-chrome'): (10, 5400),
+ ('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
+ ('opt', 'mochitest-e10s-browser-chrome-3'): (10, 5400),
+ ('opt', 'mochitest-gl'): (10, 5400),
+ ('opt', 'mochitest-other'): (10, 5400),
+ ('opt', 'reftest-no-accel'): (10, 5400),
+ ('opt', 'web-platform-tests-2'): (10, 5400),
+ ('opt', 'web-platform-tests-3'): (10, 5400),
+ ('opt', 'web-platform-tests-4'): (10, 5400),
+ ('opt', 'xpcshell'): (10, 5400),
+ }
BRANCHES['mozilla-inbound']['platforms']['linux64']['ubuntu64_vm']['skipconfig'] = {
('debug', 'cppunit'): (10, 5400),
('debug', 'jittest-1'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'marionette'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
('debug', 'mochitest-4'): (10, 5400),
('debug', 'mochitest-5'): (10, 5400),
@@ -461,48 +411,26 @@ def loadSkipConfig(BRANCHES):
('opt', 'mochitest-2'): (10, 5400),
('opt', 'mochitest-4'): (10, 5400),
('opt', 'mochitest-browser-chrome-1'): (10, 5400),
('opt', 'mochitest-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-browser-chrome-3'): (10, 5400),
('opt', 'mochitest-devtools-chrome'): (10, 5400),
('opt', 'mochitest-e10s-1'): (10, 5400),
('opt', 'mochitest-e10s-2'): (10, 5400),
- ('opt', 'mochitest-e10s-4'): (10, 5400),
('opt', 'mochitest-e10s-5'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-gl'): (10, 5400),
('opt', 'mochitest-jetpack'): (10, 5400),
('opt', 'reftest'): (10, 5400),
('opt', 'web-platform-tests-1'): (10, 5400),
+ ('opt', 'web-platform-tests-2'): (10, 5400),
('opt', 'web-platform-tests-3'): (10, 5400),
('opt', 'xpcshell'): (10, 5400),
}
- BRANCHES['mozilla-inbound']['platforms']['linux64-asan']['ubuntu64-asan_vm']['skipconfig'] = {
- ('opt', 'cppunit'): (10, 5400),
- ('opt', 'crashtest'): (10, 5400),
- ('opt', 'jittest-1'): (10, 5400),
- ('opt', 'jittest-2'): (10, 5400),
- ('opt', 'jsreftest'): (10, 5400),
- ('opt', 'mochitest-1'): (10, 5400),
- ('opt', 'mochitest-2'): (10, 5400),
- ('opt', 'mochitest-4'): (10, 5400),
- ('opt', 'mochitest-5'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-1'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-2'): (10, 5400),
- ('opt', 'mochitest-browser-chrome-3'): (10, 5400),
- ('opt', 'mochitest-devtools-chrome'): (10, 5400),
- ('opt', 'mochitest-e10s-2'): (10, 5400),
- ('opt', 'mochitest-e10s-3'): (10, 5400),
- ('opt', 'mochitest-e10s-5'): (10, 5400),
- ('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
- ('opt', 'mochitest-gl'): (10, 5400),
- ('opt', 'mochitest-jetpack'): (10, 5400),
- ('opt', 'mochitest-other'): (10, 5400),
- }
BRANCHES['mozilla-inbound']['platforms']['linux']['ubuntu32_vm']['skipconfig'] = {
('debug', 'crashtest'): (10, 5400),
('debug', 'jittest-1'): (10, 5400),
('debug', 'jittest-2'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
('debug', 'mochitest-3'): (10, 5400),
('debug', 'mochitest-4'): (10, 5400),
@@ -549,17 +477,16 @@ def loadSkipConfig(BRANCHES):
('opt', 'mochitest-gl'): (10, 5400),
('opt', 'mochitest-jetpack'): (10, 5400),
('opt', 'mochitest-other'): (10, 5400),
('opt', 'reftest-1'): (10, 5400),
('opt', 'reftest-2'): (10, 5400),
('opt', 'reftest-e10s'): (10, 5400),
('opt', 'reftest-no-accel'): (10, 5400),
('opt', 'web-platform-tests-1'): (10, 5400),
- ('opt', 'web-platform-tests-3'): (10, 5400),
('opt', 'web-platform-tests-4'): (10, 5400),
('opt', 'web-platform-tests-reftests'): (10, 5400),
('debug', 'cppunit'): (10, 5400),
('debug', 'jittest-1'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'marionette'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
('debug', 'mochitest-4'): (10, 5400),
@@ -591,23 +518,23 @@ def loadSkipConfig(BRANCHES):
('opt', 'mochitest-2'): (10, 5400),
('opt', 'mochitest-4'): (10, 5400),
('opt', 'mochitest-browser-chrome-1'): (10, 5400),
('opt', 'mochitest-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-browser-chrome-3'): (10, 5400),
('opt', 'mochitest-devtools-chrome'): (10, 5400),
('opt', 'mochitest-e10s-1'): (10, 5400),
('opt', 'mochitest-e10s-2'): (10, 5400),
- ('opt', 'mochitest-e10s-4'): (10, 5400),
('opt', 'mochitest-e10s-5'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-gl'): (10, 5400),
('opt', 'mochitest-jetpack'): (10, 5400),
('opt', 'reftest'): (10, 5400),
('opt', 'web-platform-tests-1'): (10, 5400),
+ ('opt', 'web-platform-tests-2'): (10, 5400),
('opt', 'web-platform-tests-3'): (10, 5400),
('opt', 'xpcshell'): (10, 5400),
}
BRANCHES['mozilla-inbound']['platforms']['win32']['win7-ix']['skipconfig'] = {
('debug', 'jittest'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'marionette'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
@@ -660,17 +587,16 @@ def loadSkipConfig(BRANCHES):
('debug', 'mochitest-browser-chrome-2'): (10, 5400),
('debug', 'mochitest-browser-chrome-3'): (10, 5400),
('debug', 'mochitest-devtools-chrome-1'): (10, 5400),
('debug', 'mochitest-devtools-chrome-2'): (10, 5400),
('debug', 'mochitest-devtools-chrome-3'): (10, 5400),
('debug', 'mochitest-devtools-chrome-4'): (10, 5400),
('debug', 'mochitest-gl'): (10, 5400),
('debug', 'mochitest-jetpack'): (10, 5400),
- ('debug', 'mochitest-other'): (10, 5400),
('opt', 'cppunit'): (10, 5400),
('opt', 'crashtest'): (10, 5400),
('opt', 'jittest'): (10, 5400),
('opt', 'jsreftest'): (10, 5400),
('opt', 'marionette'): (10, 5400),
('opt', 'mochitest-1'): (10, 5400),
('opt', 'mochitest-2'): (10, 5400),
('opt', 'mochitest-3'): (10, 5400),
@@ -729,16 +655,17 @@ def loadSkipConfig(BRANCHES):
BRANCHES['mozilla-inbound']['platforms']['macosx64']['snowleopard']['skipconfig'] = {
('debug', 'cppunit'): (10, 5400),
('debug', 'crashtest'): (10, 5400),
('debug', 'jittest'): (10, 5400),
('debug', 'jsreftest'): (10, 5400),
('debug', 'marionette'): (10, 5400),
('debug', 'mochitest-1'): (10, 5400),
('debug', 'mochitest-2'): (10, 5400),
+ ('debug', 'mochitest-4'): (10, 5400),
('debug', 'mochitest-browser-chrome-2'): (10, 5400),
('debug', 'mochitest-browser-chrome-3'): (10, 5400),
('debug', 'mochitest-devtools-chrome-1'): (10, 5400),
('debug', 'mochitest-devtools-chrome-2'): (10, 5400),
('debug', 'mochitest-devtools-chrome-3'): (10, 5400),
('debug', 'mochitest-gl'): (10, 5400),
('debug', 'mochitest-jetpack'): (10, 5400),
('debug', 'mochitest-other'): (10, 5400),
@@ -757,8 +684,71 @@ def loadSkipConfig(BRANCHES):
('opt', 'mochitest-devtools-chrome'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-1'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
('opt', 'mochitest-e10s-browser-chrome-3'): (10, 5400),
('opt', 'mochitest-gl'): (10, 5400),
('opt', 'mochitest-jetpack'): (10, 5400),
('opt', 'xpcshell'): (10, 5400),
}
+ BRANCHES['mozilla-inbound']['platforms']['linux64-asan']['ubuntu64-asan_vm']['skipconfig'] = {
+ ('opt', 'cppunit'): (10, 5400),
+ ('opt', 'crashtest'): (10, 5400),
+ ('opt', 'jittest-1'): (10, 5400),
+ ('opt', 'jittest-2'): (10, 5400),
+ ('opt', 'jsreftest'): (10, 5400),
+ ('opt', 'mochitest-1'): (10, 5400),
+ ('opt', 'mochitest-2'): (10, 5400),
+ ('opt', 'mochitest-4'): (10, 5400),
+ ('opt', 'mochitest-5'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-1'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-2'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-3'): (10, 5400),
+ ('opt', 'mochitest-devtools-chrome'): (10, 5400),
+ ('opt', 'mochitest-e10s-2'): (10, 5400),
+ ('opt', 'mochitest-e10s-3'): (10, 5400),
+ ('opt', 'mochitest-e10s-5'): (10, 5400),
+ ('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
+ ('opt', 'mochitest-gl'): (10, 5400),
+ ('opt', 'mochitest-jetpack'): (10, 5400),
+ ('opt', 'mochitest-other'): (10, 5400),
+ }
+ BRANCHES['mozilla-inbound']['platforms']['win64']['win8_64']['skipconfig'] = {
+ ('debug', 'cppunit'): (10, 5400),
+ ('debug', 'crashtest'): (10, 5400),
+ ('debug', 'jittest'): (10, 5400),
+ ('debug', 'jsreftest'): (10, 5400),
+ ('debug', 'marionette'): (10, 5400),
+ ('debug', 'mochitest-1'): (10, 5400),
+ ('debug', 'mochitest-2'): (10, 5400),
+ ('debug', 'mochitest-3'): (10, 5400),
+ ('debug', 'mochitest-4'): (10, 5400),
+ ('debug', 'mochitest-5'): (10, 5400),
+ ('debug', 'mochitest-browser-chrome-1'): (10, 5400),
+ ('debug', 'mochitest-browser-chrome-2'): (10, 5400),
+ ('debug', 'mochitest-browser-chrome-3'): (10, 5400),
+ ('debug', 'mochitest-devtools-chrome-1'): (10, 5400),
+ ('debug', 'mochitest-devtools-chrome-4'): (10, 5400),
+ ('debug', 'mochitest-gl'): (10, 5400),
+ ('debug', 'mochitest-jetpack'): (10, 5400),
+ ('debug', 'mochitest-other'): (10, 5400),
+ ('debug', 'reftest'): (10, 5400),
+ ('opt', 'cppunit'): (10, 5400),
+ ('opt', 'crashtest'): (10, 5400),
+ ('opt', 'jsreftest'): (10, 5400),
+ ('opt', 'marionette'): (10, 5400),
+ ('opt', 'mochitest-1'): (10, 5400),
+ ('opt', 'mochitest-2'): (10, 5400),
+ ('opt', 'mochitest-3'): (10, 5400),
+ ('opt', 'mochitest-4'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-1'): (10, 5400),
+ ('opt', 'mochitest-browser-chrome-3'): (10, 5400),
+ ('opt', 'mochitest-devtools-chrome'): (10, 5400),
+ ('opt', 'mochitest-e10s-browser-chrome-2'): (10, 5400),
+ ('opt', 'mochitest-e10s-browser-chrome-3'): (10, 5400),
+ ('opt', 'mochitest-gl'): (10, 5400),
+ ('opt', 'mochitest-other'): (10, 5400),
+ ('opt', 'reftest-no-accel'): (10, 5400),
+ ('opt', 'web-platform-tests-2'): (10, 5400),
+ ('opt', 'web-platform-tests-3'): (10, 5400),
+ ('opt', 'web-platform-tests-4'): (10, 5400),
+ ('opt', 'xpcshell'): (10, 5400),
+ }--- a/mozilla-tests/config_seta_mobile.py
+++ b/mozilla-tests/config_seta_mobile.py
@@ -1,96 +1,94 @@
def loadSkipConfigMobile(BRANCHES):
BRANCHES['fx-team']['platforms']['android-api-9']['ubuntu64_vm_large']['skipconfig'] = {
- ('opt', 'crashtest-1'): (10, 3400),
- ('opt', 'crashtest-2'): (10, 3400),
- ('opt', 'jsreftest-1'): (10, 3400),
- ('opt', 'jsreftest-2'): (10, 3400),
- ('opt', 'jsreftest-3'): (10, 3400),
- ('opt', 'jsreftest-4'): (10, 3400),
- ('opt', 'jsreftest-5'): (10, 3400),
- ('opt', 'jsreftest-6'): (10, 3400),
- ('opt', 'plain-reftest-1'): (10, 3400),
- ('opt', 'plain-reftest-10'): (10, 3400),
- ('opt', 'plain-reftest-11'): (10, 3400),
- ('opt', 'plain-reftest-12'): (10, 3400),
- ('opt', 'plain-reftest-13'): (10, 3400),
- ('opt', 'plain-reftest-14'): (10, 3400),
- ('opt', 'plain-reftest-15'): (10, 3400),
- ('opt', 'plain-reftest-16'): (10, 3400),
- ('opt', 'plain-reftest-2'): (10, 3400),
- ('opt', 'plain-reftest-3'): (10, 3400),
- ('opt', 'plain-reftest-4'): (10, 3400),
- ('opt', 'plain-reftest-5'): (10, 3400),
- ('opt', 'plain-reftest-7'): (10, 3400),
- ('opt', 'plain-reftest-9'): (10, 3400),
+ ('opt', 'crashtest-1'): (10, 5400),
+ ('opt', 'crashtest-2'): (10, 5400),
+ ('opt', 'jsreftest-1'): (10, 5400),
+ ('opt', 'jsreftest-2'): (10, 5400),
+ ('opt', 'jsreftest-3'): (10, 5400),
+ ('opt', 'jsreftest-4'): (10, 5400),
+ ('opt', 'jsreftest-5'): (10, 5400),
+ ('opt', 'jsreftest-6'): (10, 5400),
+ ('opt', 'plain-reftest-1'): (10, 5400),
+ ('opt', 'plain-reftest-10'): (10, 5400),
+ ('opt', 'plain-reftest-11'): (10, 5400),
+ ('opt', 'plain-reftest-12'): (10, 5400),
+ ('opt', 'plain-reftest-13'): (10, 5400),
+ ('opt', 'plain-reftest-14'): (10, 5400),
+ ('opt', 'plain-reftest-15'): (10, 5400),
+ ('opt', 'plain-reftest-16'): (10, 5400),
+ ('opt', 'plain-reftest-2'): (10, 5400),
+ ('opt', 'plain-reftest-3'): (10, 5400),
+ ('opt', 'plain-reftest-4'): (10, 5400),
+ ('opt', 'plain-reftest-5'): (10, 5400),
+ ('opt', 'plain-reftest-7'): (10, 5400),
+ ('opt', 'plain-reftest-9'): (10, 5400),
}
BRANCHES['fx-team']['platforms']['android-api-9']['ubuntu64_vm_mobile']['skipconfig'] = {
- ('opt', 'mochitest-1'): (10, 3400),
- ('opt', 'mochitest-10'): (10, 3400),
- ('opt', 'mochitest-11'): (10, 3400),
- ('opt', 'mochitest-12'): (10, 3400),
- ('opt', 'mochitest-14'): (10, 3400),
- ('opt', 'mochitest-16'): (10, 3400),
- ('opt', 'mochitest-2'): (10, 3400),
- ('opt', 'mochitest-3'): (10, 3400),
- ('opt', 'mochitest-5'): (10, 3400),
- ('opt', 'mochitest-6'): (10, 3400),
- ('opt', 'mochitest-7'): (10, 3400),
- ('opt', 'mochitest-8'): (10, 3400),
- ('opt', 'mochitest-gl-1'): (10, 3400),
- ('opt', 'mochitest-gl-2'): (10, 3400),
- ('opt', 'mochitest-gl-3'): (10, 3400),
- ('opt', 'mochitest-gl-4'): (10, 3400),
- ('opt', 'robocop-4'): (10, 3400),
- ('opt', 'xpcshell-1'): (10, 3400),
- ('opt', 'xpcshell-2'): (10, 3400),
- ('opt', 'xpcshell-3'): (10, 3400),
+ ('opt', 'mochitest-1'): (10, 5400),
+ ('opt', 'mochitest-10'): (10, 5400),
+ ('opt', 'mochitest-11'): (10, 5400),
+ ('opt', 'mochitest-12'): (10, 5400),
+ ('opt', 'mochitest-14'): (10, 5400),
+ ('opt', 'mochitest-16'): (10, 5400),
+ ('opt', 'mochitest-2'): (10, 5400),
+ ('opt', 'mochitest-3'): (10, 5400),
+ ('opt', 'mochitest-5'): (10, 5400),
+ ('opt', 'mochitest-6'): (10, 5400),
+ ('opt', 'mochitest-7'): (10, 5400),
+ ('opt', 'mochitest-8'): (10, 5400),
+ ('opt', 'mochitest-gl-1'): (10, 5400),
+ ('opt', 'mochitest-gl-2'): (10, 5400),
+ ('opt', 'mochitest-gl-3'): (10, 5400),
+ ('opt', 'mochitest-gl-4'): (10, 5400),
+ ('opt', 'robocop-4'): (10, 5400),
+ ('opt', 'xpcshell-1'): (10, 5400),
+ ('opt', 'xpcshell-2'): (10, 5400),
+ ('opt', 'xpcshell-3'): (10, 5400),
}
-
BRANCHES['mozilla-inbound']['platforms']['android-api-9']['ubuntu64_vm_large']['skipconfig'] = {
- ('opt', 'crashtest-1'): (10, 3400),
- ('opt', 'crashtest-2'): (10, 3400),
- ('opt', 'jsreftest-1'): (10, 3400),
- ('opt', 'jsreftest-2'): (10, 3400),
- ('opt', 'jsreftest-3'): (10, 3400),
- ('opt', 'jsreftest-4'): (10, 3400),
- ('opt', 'jsreftest-5'): (10, 3400),
- ('opt', 'jsreftest-6'): (10, 3400),
- ('opt', 'plain-reftest-1'): (10, 3400),
- ('opt', 'plain-reftest-10'): (10, 3400),
- ('opt', 'plain-reftest-11'): (10, 3400),
- ('opt', 'plain-reftest-12'): (10, 3400),
- ('opt', 'plain-reftest-13'): (10, 3400),
- ('opt', 'plain-reftest-14'): (10, 3400),
- ('opt', 'plain-reftest-15'): (10, 3400),
- ('opt', 'plain-reftest-16'): (10, 3400),
- ('opt', 'plain-reftest-2'): (10, 3400),
- ('opt', 'plain-reftest-3'): (10, 3400),
- ('opt', 'plain-reftest-4'): (10, 3400),
- ('opt', 'plain-reftest-5'): (10, 3400),
- ('opt', 'plain-reftest-7'): (10, 3400),
- ('opt', 'plain-reftest-9'): (10, 3400),
+ ('opt', 'crashtest-1'): (10, 5400),
+ ('opt', 'crashtest-2'): (10, 5400),
+ ('opt', 'jsreftest-1'): (10, 5400),
+ ('opt', 'jsreftest-2'): (10, 5400),
+ ('opt', 'jsreftest-3'): (10, 5400),
+ ('opt', 'jsreftest-4'): (10, 5400),
+ ('opt', 'jsreftest-5'): (10, 5400),
+ ('opt', 'jsreftest-6'): (10, 5400),
+ ('opt', 'plain-reftest-1'): (10, 5400),
+ ('opt', 'plain-reftest-10'): (10, 5400),
+ ('opt', 'plain-reftest-11'): (10, 5400),
+ ('opt', 'plain-reftest-12'): (10, 5400),
+ ('opt', 'plain-reftest-13'): (10, 5400),
+ ('opt', 'plain-reftest-14'): (10, 5400),
+ ('opt', 'plain-reftest-15'): (10, 5400),
+ ('opt', 'plain-reftest-16'): (10, 5400),
+ ('opt', 'plain-reftest-2'): (10, 5400),
+ ('opt', 'plain-reftest-3'): (10, 5400),
+ ('opt', 'plain-reftest-4'): (10, 5400),
+ ('opt', 'plain-reftest-5'): (10, 5400),
+ ('opt', 'plain-reftest-7'): (10, 5400),
+ ('opt', 'plain-reftest-9'): (10, 5400),
}
BRANCHES['mozilla-inbound']['platforms']['android-api-9']['ubuntu64_vm_mobile']['skipconfig'] = {
- ('opt', 'mochitest-1'): (10, 3400),
- ('opt', 'mochitest-10'): (10, 3400),
- ('opt', 'mochitest-11'): (10, 3400),
- ('opt', 'mochitest-12'): (10, 3400),
- ('opt', 'mochitest-14'): (10, 3400),
- ('opt', 'mochitest-16'): (10, 3400),
- ('opt', 'mochitest-2'): (10, 3400),
- ('opt', 'mochitest-3'): (10, 3400),
- ('opt', 'mochitest-5'): (10, 3400),
- ('opt', 'mochitest-6'): (10, 3400),
- ('opt', 'mochitest-7'): (10, 3400),
- ('opt', 'mochitest-8'): (10, 3400),
- ('opt', 'mochitest-gl-1'): (10, 3400),
- ('opt', 'mochitest-gl-2'): (10, 3400),
- ('opt', 'mochitest-gl-3'): (10, 3400),
- ('opt', 'mochitest-gl-4'): (10, 3400),
- ('opt', 'robocop-4'): (10, 3400),
- ('opt', 'xpcshell-1'): (10, 3400),
- ('opt', 'xpcshell-2'): (10, 3400),
- ('opt', 'xpcshell-3'): (10, 3400),
+ ('opt', 'mochitest-1'): (10, 5400),
+ ('opt', 'mochitest-10'): (10, 5400),
+ ('opt', 'mochitest-11'): (10, 5400),
+ ('opt', 'mochitest-12'): (10, 5400),
+ ('opt', 'mochitest-14'): (10, 5400),
+ ('opt', 'mochitest-16'): (10, 5400),
+ ('opt', 'mochitest-2'): (10, 5400),
+ ('opt', 'mochitest-3'): (10, 5400),
+ ('opt', 'mochitest-5'): (10, 5400),
+ ('opt', 'mochitest-6'): (10, 5400),
+ ('opt', 'mochitest-7'): (10, 5400),
+ ('opt', 'mochitest-8'): (10, 5400),
+ ('opt', 'mochitest-gl-1'): (10, 5400),
+ ('opt', 'mochitest-gl-2'): (10, 5400),
+ ('opt', 'mochitest-gl-3'): (10, 5400),
+ ('opt', 'mochitest-gl-4'): (10, 5400),
+ ('opt', 'robocop-4'): (10, 5400),
+ ('opt', 'xpcshell-1'): (10, 5400),
+ ('opt', 'xpcshell-2'): (10, 5400),
+ ('opt', 'xpcshell-3'): (10, 5400),
}
-