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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.expected/device_file_format_mismatch.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: rebase and retrain 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
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/coverage_builder_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/device_file_match.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/device_file_format_mismatch.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/device_file_format_mismatch.json b/scripts/slave/recipe_modules/chromium_android/example.expected/device_file_format_mismatch.json
index 51319834c9a48597627b6c607923b34758e0c4ec..11d4f25a53f24103e8eb864dba1fd1a1c4bf7be8 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/device_file_format_mismatch.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/device_file_format_mismatch.json
@@ -301,21 +301,80 @@
},
{
"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",
+ "[CACHE]/known_android_devices",
+ "--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"
+ ],
+ "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": [],
+ "name": "fix_device_file_format (2)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[CACHE]/known_android_devices",
+ "/path/to/tmp/"
+ ],
+ "name": "fix_device_file_format.read_device_file (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@file format is compatible@@@"
+ ]
+ },
+ {
+ "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",
- "[CACHE]/known_android_devices"
+ "[CACHE]/known_android_devices",
+ "--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@[@@@",
@@ -412,28 +471,43 @@
]
},
{
+ "cmd": [],
+ "name": "fix_device_file_format (3)"
+ },
+ {
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/provision_devices.py",
- "--adb-path",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[CACHE]/known_android_devices",
+ "/path/to/tmp/"
+ ],
+ "name": "fix_device_file_format.read_device_file (3)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@file format is compatible@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
- "--output-device-blacklist",
- "/path/to/tmp/json",
- "-t",
- "Release"
+ "--known-devices-file",
+ "[CACHE]/known_android_devices",
+ "--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": "provision_devices"
+ "name": "device_recovery (2)"
},
{
"cmd": [],
- "name": "fix_device_file_format (2)"
+ "name": "fix_device_file_format (4)"
},
{
"cmd": [
@@ -443,7 +517,7 @@
"[CACHE]/known_android_devices",
"/path/to/tmp/"
],
- "name": "fix_device_file_format.read_device_file (2)",
+ "name": "fix_device_file_format.read_device_file (4)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@file format is compatible@@@"
@@ -451,21 +525,25 @@
},
{
"cmd": [
- "[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",
+ "[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",
- "[CACHE]/known_android_devices"
+ "[CACHE]/known_android_devices",
+ "--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 (2)",
+ "name": "device_status (2)",
"~followup_annotations": [
"@@@STEP_TEXT@Online devices: 1@@@",
"@@@STEP_LOG_LINE@json.output@[@@@",
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/coverage_builder_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/device_file_match.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698