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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json

Issue 2059993002: [Android] Move to new device status and recovery scripts. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 6 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
« scripts/slave/recipes/mojo.py ('K') | « scripts/slave/recipes/mojo.py ('k') | scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json
diff --git a/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json b/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json
index cf39949ef9ba66e0753fdbfa42b951712326d7d1..9cca7b43ed9571f7ab35be6a979150a2dc649a2c 100644
--- a/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json
+++ b/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json
@@ -90,20 +90,41 @@
},
{
"cmd": [
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
+ "--known-devices-file",
+ "[BUILD]/site_config/.known_devices",
+ "-v"
+ ],
+ "name": "device_recovery"
+ },
+ {
+ "cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
+ "[SLAVE_BUILD]/src/build/android/provision_devices.py"
+ ],
+ "name": "provision_device"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/buildbot/device_status.py",
"--json-output",
"/path/to/tmp/json",
- "--restart-usb",
"--known-devices-file",
- "[BUILD]/site_config/.known_devices"
+ "[BUILD]/site_config/.known_devices",
+ "--buildbot-path",
+ "/home/chrome-bot/.adb_device_info",
+ "-v",
+ "--overwrite-known-devices-files"
],
- "name": "device_status_check",
+ "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\", @@@",
@@ -117,29 +138,90 @@
"@@@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\": \"LRX21O\", @@@",
"@@@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@ \"serial\": \"07a00ca4\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"type\": \"flo\", @@@",
+ "@@@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@ {@@@",
+ "@@@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_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@{@@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"adb_status\": \"device\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"battery\": {@@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"AC powered\": \"false\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"USB powered\": \"true\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"Wireless powered\": \"false\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"health\": \"2\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"level\": \"100\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"present\": \"true\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"scale\": \"100\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"status\": \"5\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"technology\": \"Li-ion\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"temperature\": \"249\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"voltage\": \"4286\"@@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ }, @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"blacklisted\": false, @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"build\": \"LRX21O\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"imei_slice\": \"Unknown\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"serial\": \"07a00ca4\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"type\": \"flo\", @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"usb_status\": true, @@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"wifi_ip\": \"\"@@@",
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@}@@@",
+ "@@@STEP_LOG_END@flo 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_LOG_LINE@unknown device 1@{}@@@",
+ "@@@STEP_LOG_END@unknown device 1@@@"
]
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/provision_devices.py"
- ],
- "name": "provision_device"
- },
- {
- "cmd": [
- "python",
- "-u",
"[SLAVE_BUILD]/src/mojo/tools/get_test_list.py",
"{\"build_number\": 571, \"builder_name\": \"Mojo Android Builder Tests (dbg)\", \"dcheck_always_on\": false, \"is_debug\": true, \"master_name\": \"chromium.testing.master\", \"target_os\": \"android\", \"test_results_server\": \"test-results.appspot.com\", \"test_types\": [\"default\"]}",
"/path/to/tmp/json"
« scripts/slave/recipes/mojo.py ('K') | « scripts/slave/recipes/mojo.py ('k') | scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698