scripts/slave/recipes/android/perf.expected/test_failure.json - Issue 2143013002: Revert "[Android] Reland splitting of device recovery and device status."

Unified Diff: scripts/slave/recipes/android/perf.expected/test_failure.json

Issue 2143013002: Revert "[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

« no previous file with comments | « scripts/slave/recipes/android/perf.expected/src_side_script_fails.json ('k') | scripts/slave/recipes/bisection/android_bisect.expected/basic_android_fyi_perf_bisect.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/perf.expected/test_failure.json

diff --git a/scripts/slave/recipes/android/perf.expected/test_failure.json b/scripts/slave/recipes/android/perf.expected/test_failure.json

index a3ab9d5ddf8fa21e2a47962625c58e7fb77ff094..d95e1d07234d04c97fe60596c79c50bbbca8ad2b 100644

--- a/scripts/slave/recipes/android/perf.expected/test_failure.json

+++ b/scripts/slave/recipes/android/perf.expected/test_failure.json

@@ -233,68 +233,21 @@

{

"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"

- },

- {

- "cmd": [

- "python",

- "-u",

- "[SLAVE_BUILD]/src/build/android/provision_devices.py",

+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.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"

- ],

- "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",

- "--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"

+ "[HOME]/.android/known_devices.json"

"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",

+ "name": "device_status_check",

"~followup_annotations": [

"@@@STEP_TEXT@Online devices: 1@@@",

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

@@ -394,6 +347,32 @@

"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"

+ ],

+ "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",