scripts/slave/recipes/android/tester.expected/tryserver_chromium_linux_android_rel_tests_recipe.json - Issue 815213002: Cause chromium_android recipe to consume device_status_check's json.

Unified Diff: scripts/slave/recipes/android/tester.expected/tryserver_chromium_linux_android_rel_tests_recipe.json

Issue 815213002: Cause chromium_android recipe to consume device_status_check's json. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Add missing files Created 6 years 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/android/tester.expected/tryserver_chromium_linux_android_dbg_tests_recipe.json ('k') | scripts/slave/recipes/android_webview_aosp_perf.expected/basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/tester.expected/tryserver_chromium_linux_android_rel_tests_recipe.json

diff --git a/scripts/slave/recipes/android/tester.expected/tryserver_chromium_linux_android_rel_tests_recipe.json b/scripts/slave/recipes/android/tester.expected/tryserver_chromium_linux_android_rel_tests_recipe.json

index a8437d467912508851ba06ed9298069699224423..c916320ba5bd8dca2111a62b694fb90802b094c0 100644

--- a/scripts/slave/recipes/android/tester.expected/tryserver_chromium_linux_android_rel_tests_recipe.json

+++ b/scripts/slave/recipes/android/tester.expected/tryserver_chromium_linux_android_rel_tests_recipe.json

@@ -249,12 +249,40 @@

{

"cmd": [

- "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py"

+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",

+ "--json-output",

+ "/path/to/tmp/json"

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "device_status_check"

+ "name": "device_status_check",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output@[@@@",

+ "@@@STEP_LOG_LINE@json.output@ {@@@",

+ "@@@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@ \"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@ \"wifi_ip\": \"\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }@@@",

+ "@@@STEP_LOG_LINE@json.output@]@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

{

"cmd": [