Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1729)

Unified Diff: scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json

Issue 2119483003: Reland "Allow multiple devices on bisects hosts " (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Remove irrelavant if statement, rename connected_devices variable Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_failed_device.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_cq_no_changes_android_one_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json
similarity index 79%
copy from scripts/slave/recipes/bisection/android_bisect.expected/perf_cq_no_changes_android_one_perf_bisect.json
copy to scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json
index 7290bfdd8e94bb15cfb29910da5045bc3942275c..428757e4a5336f20396e051bbd7dd872a73d5a00 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/perf_cq_no_changes_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/no_benchmark_file@@@",
+ "@@@STEP_LOG_LINE@files@foo.cc@@@",
"@@@STEP_LOG_END@files@@@"
]
},
@@ -257,98 +257,9 @@
},
"name": "device_status",
"~followup_annotations": [
- "@@@STEP_TEXT@Online devices: 1@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"level\": \"100\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"present\": \"true\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"scale\": \"100\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"status\": \"5\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"technology\": \"Li-ion\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"temperature\": \"249\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"voltage\": \"4286\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"imei_slice\": \"Unknown\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"ro.build.id\": \"LRX21O\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"ro.build.product\": \"product_name\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"serial\": \"07a00ca4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"offline\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"usb_status\": false@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"unauthorized\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad5\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad6\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@{@@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"adb_status\": \"device\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"battery\": {@@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"AC powered\": \"false\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"USB powered\": \"true\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"Wireless powered\": \"false\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"health\": \"2\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"level\": \"100\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"present\": \"true\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"scale\": \"100\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"status\": \"5\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"technology\": \"Li-ion\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"temperature\": \"249\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"voltage\": \"4286\"@@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ }, @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"blacklisted\": false, @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"imei_slice\": \"Unknown\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"ro.build.id\": \"LRX21O\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"ro.build.product\": \"product_name\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"serial\": \"07a00ca4\", @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"usb_status\": true, @@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"wifi_ip\": \"\"@@@",
- "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@}@@@",
- "@@@STEP_LOG_END@product_name LRX21O 07a00ca4@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@{@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"adb_status\": \"offline\", @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"blacklisted\": true, @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"serial\": \"03e0363a003c6ad4\", @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"usb_status\": false@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@}@@@",
- "@@@STEP_LOG_END@03e0363a003c6ad4: missing@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@{@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"adb_status\": \"unauthorized\", @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"blacklisted\": true, @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"serial\": \"03e0363a003c6ad5\", @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"usb_status\": true@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@}@@@",
- "@@@STEP_LOG_END@03e0363a003c6ad5: adb status unauthorized@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@{@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device\", @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a003c6ad6\", @@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@",
- "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
- "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
+ "@@@STEP_TEXT@Online devices: 0@@@",
+ "@@@STEP_LOG_LINE@json.output@[]@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
@@ -363,7 +274,7 @@
"--",
"RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
- "[\"07a00ca4\"]",
+ "[]",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
@@ -387,10 +298,30 @@
"name": "gclient runhooks"
},
{
- "cmd": [],
- "name": "Results",
+ "cmd": [
+ "[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"
+ ],
+ "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_status (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@There are no modifications to Telemetry benchmarks, aborting the try job.@@@"
+ "@@@STEP_TEXT@Online devices: 0@@@",
+ "@@@STEP_LOG_LINE@json.output@[]@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
@@ -421,7 +352,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src@HEAD",
+ "src@1111111",
"--output_manifest"
],
"env": {
@@ -433,7 +364,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\": {@@@",
@@ -609,7 +540,8 @@
},
{
"name": "$result",
+ "reason": "No Android test devices are available",
"recipe_result": null,
- "status_code": 0
+ "status_code": 1
}
]
« no previous file with comments | « scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_failed_device.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698