🐾 Reland of Enable instrumentation tests on Android Swarm Builder

testing/buildbot/chromium.android.json

Index: testing/buildbot/chromium.android.json
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index f0da75c1b0cb5493f9ce838e528dda1e228bb8b5..48a7cc51ae72710b3ea8f8b44112b8362db77ad0 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -21,6 +21,18 @@
             }
           ]
         },
+        "test": "android_webview_test"

[jbudorick, 2016/04/27 15:32:13]

stip: Should we set hard_timeouts for these suites?

[ghost stip (do not use), 2016/04/27 20:02:57]

I mean, yeah, but let's not worry about that until the bot is 100% up

[jbudorick, 2016/04/27 20:03:52]

I just don't want these suites accidentally keeping capacity away from larng for
too long.

+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_os": "KTU84P",
+              "device_type": "hammerhead"
+            }
+          ]
+        },
         "test": "android_webview_unittests"
       },
       {
@@ -45,7 +57,7 @@
             }
           ]
         },
-        "test": "blimp_unittests"
+        "test": "blimp_test"
       },
       {
         "swarming": {
@@ -57,7 +69,7 @@
             }
           ]
         },
-        "test": "breakpad_unittests"
+        "test": "blimp_unittests"
       },
       {
         "swarming": {
@@ -69,7 +81,7 @@
             }
           ]
         },
-        "test": "cc_unittests"
+        "test": "breakpad_unittests"
       },
       {
         "swarming": {
@@ -81,7 +93,7 @@
             }
           ]
         },
-        "test": "components_browsertests"
+        "test": "cc_unittests"
       },
       {
         "swarming": {
@@ -93,7 +105,7 @@
             }
           ]
         },
-        "test": "components_unittests"
+        "test": "chrome_public_test"
       },
       {
         "swarming": {
@@ -105,7 +117,7 @@
             }
           ]
         },
-        "test": "content_browsertests"
+        "test": "chrome_sync_shell_test"
       },
       {
         "swarming": {
@@ -117,7 +129,7 @@
             }
           ]
         },
-        "test": "content_unittests"
+        "test": "components_browsertests"
       },
       {
         "swarming": {
@@ -129,7 +141,7 @@
             }
           ]
         },
-        "test": "device_unittests"
+        "test": "components_unittests"
       },
       {
         "swarming": {
@@ -141,7 +153,7 @@
             }
           ]
         },
-        "test": "events_unittests"
+        "test": "content_browsertests"
       },
       {
         "swarming": {
@@ -153,7 +165,7 @@
             }
           ]
         },
-        "test": "gl_tests"
+        "test": "content_shell_test"
       },
       {
         "swarming": {
@@ -165,7 +177,7 @@
             }
           ]
         },
-        "test": "gpu_unittests"
+        "test": "content_unittests"
       },
       {
         "swarming": {
@@ -177,7 +189,7 @@
             }
           ]
         },
-        "test": "ipc_tests"
+        "test": "device_unittests"
       },
       {
         "swarming": {
@@ -189,7 +201,7 @@
             }
           ]
         },
-        "test": "media_unittests"
+        "test": "events_unittests"
       },
       {
         "swarming": {
@@ -201,7 +213,7 @@
             }
           ]
         },
-        "test": "net_unittests"
+        "test": "gl_tests"
       },
       {
         "swarming": {
@@ -213,7 +225,7 @@
             }
           ]
         },
-        "test": "sandbox_linux_unittests"
+        "test": "gpu_unittests"
       },
       {
         "swarming": {
@@ -225,7 +237,7 @@
             }
           ]
         },
-        "test": "sql_unittests"
+        "test": "ipc_tests"
       },
       {
         "swarming": {
@@ -237,7 +249,7 @@
             }
           ]
         },
-        "test": "sync_unit_tests"
+        "test": "media_unittests"
       },
       {
         "swarming": {
@@ -249,7 +261,7 @@
             }
           ]
         },
-        "test": "ui_android_unittests"
+        "test": "net_unittests"
       },
       {
         "swarming": {
@@ -261,7 +273,7 @@
             }
           ]
         },
-        "test": "ui_base_unittests"
+        "test": "sandbox_linux_unittests"
       },
       {
         "swarming": {
@@ -273,7 +285,7 @@
             }
           ]
         },
-        "test": "ui_touch_selection_unittests"
+        "test": "sql_unittests"
       },
       {
         "swarming": {
@@ -285,15 +297,9 @@
             }
           ]
         },
-        "test": "unit_tests"
-      }
-    ],
-    "instrumentation_tests": [
+        "test": "sync_unit_tests"
+      },
       {
-        "apk_under_test": "Blimp.apk",
-        "override_compile_targets": [
-          "blimp_test_apk"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -303,8 +309,7 @@
             }
           ]
         },
-        "test": "blimp_test_apk",
-        "test_apk": "BlimpTest.apk"
+        "test": "ui_android_unittests"
       },
       {
         "swarming": {
@@ -316,7 +321,7 @@
             }
           ]
         },
-        "test": "chrome_public_test_apk"
+        "test": "ui_base_unittests"
       },
       {
         "swarming": {
@@ -328,7 +333,7 @@
             }
           ]
         },
-        "test": "chrome_sync_shell_test_apk"
+        "test": "ui_touch_selection_unittests"
       },
       {
         "swarming": {
@@ -340,7 +345,7 @@
             }
           ]
         },
-        "test": "content_shell_test_apk"
+        "test": "unit_tests"
       }
     ]
   },