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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2146433003: [Android] Reland splitting of device recovery and device status. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: 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
« scripts/slave/recipe_modules/chromium_android/api.py ('K') | « scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_s5_perf_bisect.json ('k') | scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_webview_arm64_aosp_perf_bisect.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_s5_perf_cq.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_s5_perf_cq.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_s5_perf_cq.json
index eebaa30cf544bb751f9071ddc4bb2555e03c88c8..fd16228d9537af24a0d733a3a9faa15dd6c951d6 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_s5_perf_cq.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_s5_perf_cq.json
@@ -193,21 +193,69 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
+ "[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"
+ },
+ {
+ "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",
+ "--min-battery-level",
+ "95",
+ "--disable-network",
+ "--disable-java-debug",
+ "--max-battery-temp",
+ "350",
+ "--remove-system-webview"
+ ],
+ "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"
+ },
+ {
+ "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"
+ "[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_check",
+ "name": "device_status",
"~followup_annotations": [
"@@@STEP_TEXT@Online devices: 1@@@",
"@@@STEP_LOG_LINE@json.output@[@@@",
@@ -227,11 +275,11 @@
"@@@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@ \"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@ \"type\": \"flo\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"usb_status\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
@@ -255,31 +303,31 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@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@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, @@@",
@@ -307,33 +355,6 @@
"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",
- "--min-battery-level",
- "95",
- "--disable-network",
- "--disable-java-debug",
- "--max-battery-temp",
- "350",
- "--remove-system-webview"
- ],
- "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"
- },
- {
- "cmd": [
- "python",
- "-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
"--action",
"restart",
« scripts/slave/recipe_modules/chromium_android/api.py ('K') | « scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_s5_perf_bisect.json ('k') | scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_webview_arm64_aosp_perf_bisect.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698