summaryrefslogtreecommitdiffstats
path: root/testing/buildbot
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-20 18:07:21 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-20 18:13:00 +0000
commitaa70e2473f249eeba78a87656ee0032771c72014 (patch)
treec150ab84cf0021ee4daebc42f43ed7a58ef77969 /testing/buildbot
parent2b583e83e39dc3fed4ced875ebe23ebeca9df500 (diff)
downloadchromium_src-aa70e2473f249eeba78a87656ee0032771c72014.zip
chromium_src-aa70e2473f249eeba78a87656ee0032771c72014.tar.gz
chromium_src-aa70e2473f249eeba78a87656ee0032771c72014.tar.bz2
Add sync_integration_tests to debug and release bots on waterfall.
Right now they were only on Mac 10.6 release, Windows 7 32 & 64 bit release, and Linux release. Since the trybots run release-with-asserts, this discrepancy means that the CQ could fail while the tree is green. This also removes 3 columns from the main waterfall. Also rebalance Linux slaves by putting browser_tests by itself for debug. BUG=384941,387743 NOTRY=true R=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/479703003 Cr-Commit-Position: refs/heads/master@{#290865} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/buildbot')
-rw-r--r--testing/buildbot/chromium.linux.json3
-rw-r--r--testing/buildbot/chromium.mac.json4
-rw-r--r--testing/buildbot/chromium.win.json5
3 files changed, 12 insertions, 0 deletions
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index e72a16d..bfbcc3d 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -34,6 +34,7 @@
"ui_unittests",
"ipc_mojo_unittests",
"ipc_tests",
+ "sync_integration_tests",
"sync_unit_tests",
"unit_tests",
"views_unittests",
@@ -142,6 +143,7 @@
"ui_unittests",
"ipc_mojo_unittests",
"ipc_tests",
+ "sync_integration_tests",
"sync_unit_tests",
"unit_tests",
"views_unittests",
@@ -202,6 +204,7 @@
"ui_unittests",
"ipc_mojo_unittests",
"ipc_tests",
+ "sync_integration_tests",
"sync_unit_tests",
"unit_tests",
"views_unittests",
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 2fca374..8885e21 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -38,6 +38,7 @@
"remoting_unittests",
"sandbox_mac_unittests",
"sql_unittests",
+ "sync_integration_tests",
"sync_unit_tests",
"ui_unittests",
"unit_tests",
@@ -88,6 +89,7 @@
"remoting_unittests",
"sandbox_mac_unittests",
"sql_unittests",
+ "sync_integration_tests",
"sync_unit_tests",
"ui_unittests",
"unit_tests",
@@ -138,6 +140,7 @@
"remoting_unittests",
"sandbox_mac_unittests",
"sql_unittests",
+ "sync_integration_tests",
"sync_unit_tests",
"ui_unittests",
"unit_tests",
@@ -188,6 +191,7 @@
"remoting_unittests",
"sandbox_mac_unittests",
"sql_unittests",
+ "sync_integration_tests",
"sync_unit_tests",
"ui_unittests",
"unit_tests",
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 99798e7..e84d08b 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -35,6 +35,7 @@
"ash_unittests",
"compositor_unittests",
"events_unittests",
+ "sync_integration_tests",
{"test": "browser_tests", "shard_index": 1, "total_shards": 3}
]
},
@@ -91,6 +92,7 @@
"ash_unittests",
"compositor_unittests",
"events_unittests",
+ "sync_integration_tests",
{"test": "browser_tests", "shard_index": 1, "total_shards": 3}
]
},
@@ -143,6 +145,7 @@
"sbox_unittests",
"sbox_integration_tests",
"sbox_validation_tests",
+ "sync_integration_tests",
{"test": "browser_tests", "shard_index": 0, "total_shards": 3},
"content_browsertests",
"installer_util_unittests"
@@ -222,6 +225,7 @@
"chrome_elf_unittests",
"net_unittests",
"app_list_unittests",
+ "sync_integration_tests",
{"test": "browser_tests", "shard_index": 1, "total_shards": 3}
]
},
@@ -276,6 +280,7 @@
"compositor_unittests",
"events_unittests",
"ipc_tests",
+ "sync_integration_tests",
"sync_unit_tests",
"unit_tests",
"sql_unittests",