Swarm tests on the main waterfall ChromeOS bots.

testing/buildbot/chromium.chromiumos.json

Index: testing/buildbot/chromium.chromiumos.json
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index cfa97d24051de3849fd517577a927ba5cdf84bb9..16faf354b557a4b8719517a66b38170584202e8d 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -2,10 +2,34 @@
   "Linux ChromiumOS Tests (1)": {
     "gtest_tests": [
       "accessibility_unittests",
-      "base_unittests",
+      {
+        "test": "base_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
+      {
+        "test": "browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 5
+        }
+      },
       "cacheinvalidation_unittests",
       "chromeos_unittests",
       "components_unittests",
+      {
+        "test": "content_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
+      {
+        "test": "content_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "crypto_unittests",
       "dbus_unittests",
       "display_unittests",
@@ -14,6 +38,12 @@
       "google_apis_unittests",
       "gpu_unittests",
       "url_unittests",
+      {
+        "test": "interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "jingle_unittests",
       "content_unittests",
       "device_unittests",
@@ -34,29 +64,55 @@
       "events_unittests",
       "ipc_tests",
       "sync_unit_tests",
-      "unit_tests",
+      {
+        "test": "unit_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "sql_unittests",
       "nacl_loader_unittests",
-      "athena_unittests"
+      "athena_unittests",
+      "app_shell_browsertests",

[Paweł Hajdan Jr., 2014/09/24 22:50:09]

These tests didn't seem to previously be here, what's going on?

[jam, 2014/09/24 22:54:20]

I just moved them from the 2nd tester

+      "chromevox_tests"
     ]
   },
   "Linux ChromiumOS Tests (2)": {

[Paweł Hajdan Jr., 2014/09/24 22:50:09]

Why are things being removed here but the builder name is still there?

[jam, 2014/09/24 22:54:20]

I'm planning on removing this after, just like the patches I sent you for Linux
to remove the 2nd tester

     "gtest_tests": [
-      "interactive_ui_tests",
-      "browser_tests",
-      "content_browsertests",
-      "app_shell_browsertests",
-      "chromevox_tests"
     ]
   },
   "Linux ChromiumOS Ozone Tests (1)": {
     "gtest_tests": [
       "accessibility_unittests",
       "ash_unittests",
-      "base_unittests",
+      {
+        "test": "base_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
+      {
+        "test": "browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 5
+        }
+      },
       "cacheinvalidation_unittests",
       "chromeos_unittests",
       "components_unittests",
+      {
+        "test": "content_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
+      {
+        "test": "content_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "crypto_unittests",
       "dbus_unittests",
       "display_unittests",
@@ -64,12 +120,23 @@
       "gcm_unit_tests",
       "google_apis_unittests",
       "gpu_unittests",
+      {
+        "test": "interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "url_unittests",
       "jingle_unittests",
       "content_unittests",
       "device_unittests",
       "media_unittests",
-      "net_unittests",
+      {
+        "test": "net_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "ozone_unittests",
       "ppapi_unittests",
       "printing_unittests",
@@ -85,25 +152,32 @@
       "events_unittests",
       "ipc_tests",
       "sync_unit_tests",
-      "unit_tests",
+      {
+        "test": "unit_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "sql_unittests",
       "nacl_loader_unittests",
-      "athena_unittests"
+      "athena_unittests",
+      "app_shell_browsertests",
+      "chromevox_tests"
     ]
   },
   "Linux ChromiumOS Ozone Tests (2)": {
     "gtest_tests": [
-      "interactive_ui_tests",
-      "browser_tests",
-      "content_browsertests",
-      "app_shell_browsertests",
-      "chromevox_tests"
     ]
   },
   "Linux ChromiumOS Tests (dbg)(1)": {
     "gtest_tests": [
       "accessibility_unittests",
-      "base_unittests",
+      {
+        "test": "base_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "cacheinvalidation_unittests",
       "chromeos_unittests",
       "components_unittests",
@@ -114,7 +188,12 @@
       "gpu_unittests",
       "url_unittests",
       "jingle_unittests",
-      "content_unittests",
+      {
+        "test": "content_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "device_unittests",
       "display_unittests",
       "media_unittests",
@@ -133,26 +212,52 @@
       "events_unittests",
       "ipc_tests",
       "sync_unit_tests",
-      "unit_tests",
+      {
+        "test": "unit_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "sql_unittests",
       "nacl_loader_unittests",
-      {"test": "browser_tests", "shard_index": 0, "total_shards": 3}
+      {
+        "test": "net_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
+      {
+        "test": "browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 20
+        }
+      },
+      "app_shell_browsertests",
+      {
+        "test": "content_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 2
+        }
+      },
+      "athena_unittests",
+      "gcm_unit_tests",
+      {
+        "test": "interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 3
+        }
+      }
     ]
   },
   "Linux ChromiumOS Tests (dbg)(2)": {
     "gtest_tests": [
-      "app_shell_browsertests",
-      "content_browsertests",
-      "net_unittests",
-      {"test": "browser_tests", "shard_index": 1, "total_shards": 3}
     ]
   },
   "Linux ChromiumOS Tests (dbg)(3)": {
     "gtest_tests": [
-      "athena_unittests",
-      "gcm_unit_tests",
-      "interactive_ui_tests",
-      {"test": "browser_tests", "shard_index": 2, "total_shards": 3}
     ]
   }
 }