Reland "Allow multiple devices on bisects hosts "

scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json

Index: scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_one_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json
similarity index 95%
copy from scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_one_perf_bisect.json
copy to scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json
index 8d0a6b05ffe839c774026969365941f2f0d9b56b..f7684d183aa0821ac3b645c9855988717c602050 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_one_perf_bisect.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json
@@ -27,7 +27,7 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "src@HEAD",
+      "src@1111111",
       "--output_manifest"
     ],
     "env": {
@@ -39,7 +39,7 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"1111111\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
@@ -147,7 +147,7 @@
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@files@tools/run-perf-test.cfg@@@",
+      "@@@STEP_LOG_LINE@files@foo.cc@@@",
       "@@@STEP_LOG_END@files@@@"
     ]
   },
@@ -388,35 +388,46 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[build::perf_try]/resources/load_config_to_json.py",
-      "--source",
-      "[SLAVE_BUILD]/src/tools/run-perf-test.cfg",
-      "--output_json",
-      "/path/to/tmp/json"
+      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--known-devices-file",
+      "[HOME]/.android/known_devices.json",
+      "--adb-path",
+      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+      "-v"
     ],
-    "name": "load config",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"max_time_minutes\": \"25\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"repeat_count\": \"1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"target_arch\": \"ia32\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"truncate_percent\": \"25\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "device_recovery (2)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
+      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--known-devices-file",
+      "[HOME]/.android/known_devices.json",
+      "--buildbot-path",
+      "/home/chrome-bot/.adb_device_info",
+      "--adb-path",
+      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+      "-v",
+      "--overwrite-known-devices-files"
     ],
-    "name": "Recipe failed. Reason: Could not load config file. Double check your changes to config files for syntax errors.",
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "multiple_device_status",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@python.inline@import sys; sys.exit(1)@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
+      "@@@STEP_TEXT@Online devices: 0@@@",
+      "@@@STEP_LOG_LINE@json.output@[]@@@",
+      "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
@@ -447,7 +458,7 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "src@HEAD",
+      "src@1111111",
       "--output_manifest"
     ],
     "env": {
@@ -459,7 +470,7 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"1111111\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
@@ -635,7 +646,8 @@
   },
   {
     "name": "$result",
+    "reason": "No Android test devices are available",
     "recipe_result": null,
-    "status_code": 0
+    "status_code": 1
   }
 ]