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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json

Issue 2453683002: [android] Make chromium.gpu.fyi bots use devil adb throughout. (Closed)
Patch Set: Created 4 years, 2 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/recipe_modules/chromium_android/example.expected/perf_runner_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_user_build_basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json b/scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json
index e78d86592570ad76ab67039627098c5da093e5d6..f6a72005a9a418224f9c6026d773ca9cb9a678e5 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json
@@ -816,6 +816,217 @@
"cmd": [
"python",
"-u",
+ "[SLAVE_BUILD]/src/build/symlink.py",
+ "-f",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "~/adb"
+ ],
+ "name": "create adb symlink"
+ },
+ {
+ "cmd": [
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+ "[SLAVE_BUILD]/src/out/logcat",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
+ ],
+ "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": "spawn_logcat_monitor (2)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+ "--action",
+ "restart",
+ "--pid-file-path",
+ "/tmp/device_monitor.pid",
+ "--",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "name": "spawn_device_monitor"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
+ "--verbose",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
+ ],
+ "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": "authorize_adb_devices (2)"
+ },
+ {
+ "cmd": [
+ "[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"
+ ],
+ "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 (4)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--output-device-blacklist",
+ "/path/to/tmp/json",
+ "-t",
+ "Release"
+ ],
+ "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": "provision_devices (3)"
+ },
+ {
+ "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 (4)",
+ "~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@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[SLAVE_BUILD]/src/build/android/test_runner.py",
"monkey",
"-v",
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_user_build_basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698