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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipe_modules/chromium_android/example.expected/tester_offline_devices.json

Issue 2107003002: Revert "[Android] Move to new device status and recovery scripts." (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 unified diff | Download patch
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices_during_status.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_pat h):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files :\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.joi n(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove (path_to_file)\n", 6 "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_pat h):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files :\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.joi n(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove (path_to_file)\n",
7 "[SLAVE_BUILD]" 7 "[SLAVE_BUILD]"
8 ], 8 ],
9 "name": "cleanup index.lock", 9 "name": "cleanup index.lock",
10 "~followup_annotations": [ 10 "~followup_annotations": [
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" 263 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
264 ], 264 ],
265 "env": { 265 "env": {
266 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 266 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
267 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 267 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
268 }, 268 },
269 "name": "authorize_adb_devices" 269 "name": "authorize_adb_devices"
270 }, 270 },
271 { 271 {
272 "cmd": [ 272 "cmd": [
273 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 273 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
274 "--adb-path",
275 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
274 "--blacklist-file", 276 "--blacklist-file",
275 "[SLAVE_BUILD]/src/out/bad_devices.json", 277 "[SLAVE_BUILD]/src/out/bad_devices.json",
278 "--json-output",
279 "/path/to/tmp/json",
276 "--known-devices-file", 280 "--known-devices-file",
277 "[CACHE]/known_android_devices", 281 "[CACHE]/known_android_devices"
278 "--adb-path",
279 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
280 "-v"
281 ], 282 ],
282 "env": { 283 "env": {
283 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 284 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
284 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 285 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
285 }, 286 },
286 "name": "device_recovery" 287 "name": "device_status_check",
287 },
288 {
289 "cmd": [
290 "python",
291 "-u",
292 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
293 "--adb-path",
294 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
295 "--blacklist-file",
296 "[SLAVE_BUILD]/src/out/bad_devices.json",
297 "--output-device-blacklist",
298 "/path/to/tmp/json",
299 "-t",
300 "Release"
301 ],
302 "env": {
303 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
304 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
305 },
306 "name": "provision_devices"
307 },
308 {
309 "cmd": [
310 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_s tatus.py",
311 "--json-output",
312 "/path/to/tmp/json",
313 "--blacklist-file",
314 "[SLAVE_BUILD]/src/out/bad_devices.json",
315 "--known-devices-file",
316 "[CACHE]/known_android_devices",
317 "--buildbot-path",
318 "/home/chrome-bot/.adb_device_info",
319 "--adb-path",
320 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
321 "-v",
322 "--overwrite-known-devices-files"
323 ],
324 "env": {
325 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
326 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
327 },
328 "name": "device_status",
329 "~followup_annotations": [ 288 "~followup_annotations": [
330 "@@@STEP_TEXT@Online devices: 0@@@", 289 "@@@STEP_TEXT@Online devices: 0@@@",
331 "@@@STEP_LOG_LINE@json.output@[@@@", 290 "@@@STEP_LOG_LINE@json.output@[@@@",
332 "@@@STEP_LOG_LINE@json.output@ {}, @@@", 291 "@@@STEP_LOG_LINE@json.output@ {}, @@@",
333 "@@@STEP_LOG_LINE@json.output@ {}@@@", 292 "@@@STEP_LOG_LINE@json.output@ {}@@@",
334 "@@@STEP_LOG_LINE@json.output@]@@@", 293 "@@@STEP_LOG_LINE@json.output@]@@@",
335 "@@@STEP_LOG_END@json.output@@@", 294 "@@@STEP_LOG_END@json.output@@@",
336 "@@@STEP_LOG_LINE@unknown device 1@{}@@@", 295 "@@@STEP_LOG_LINE@unknown device 1@{}@@@",
337 "@@@STEP_LOG_END@unknown device 1@@@", 296 "@@@STEP_LOG_END@unknown device 1@@@",
338 "@@@STEP_LOG_LINE@unknown device 2@{}@@@", 297 "@@@STEP_LOG_LINE@unknown device 2@{}@@@",
339 "@@@STEP_LOG_END@unknown device 2@@@" 298 "@@@STEP_LOG_END@unknown device 2@@@"
340 ] 299 ]
341 }, 300 },
342 { 301 {
343 "cmd": [ 302 "cmd": [
344 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 303 "python",
304 "-u",
305 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
306 "--adb-path",
307 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
345 "--blacklist-file", 308 "--blacklist-file",
346 "[SLAVE_BUILD]/src/out/bad_devices.json", 309 "[SLAVE_BUILD]/src/out/bad_devices.json",
347 "--known-devices-file", 310 "--output-device-blacklist",
348 "[CACHE]/known_android_devices", 311 "/path/to/tmp/json",
349 "--adb-path", 312 "-t",
350 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 313 "Release"
351 "-v"
352 ], 314 ],
353 "env": { 315 "env": {
354 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 316 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
355 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 317 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
356 }, 318 },
357 "name": "device_recovery (2)" 319 "name": "provision_devices"
358 }, 320 },
359 { 321 {
360 "cmd": [ 322 "cmd": [
361 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_s tatus.py", 323 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
324 "--adb-path",
325 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
326 "--blacklist-file",
327 "[SLAVE_BUILD]/src/out/bad_devices.json",
362 "--json-output", 328 "--json-output",
363 "/path/to/tmp/json", 329 "/path/to/tmp/json",
364 "--blacklist-file",
365 "[SLAVE_BUILD]/src/out/bad_devices.json",
366 "--known-devices-file", 330 "--known-devices-file",
367 "[CACHE]/known_android_devices", 331 "[CACHE]/known_android_devices"
368 "--buildbot-path",
369 "/home/chrome-bot/.adb_device_info",
370 "--adb-path",
371 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
372 "-v",
373 "--overwrite-known-devices-files"
374 ], 332 ],
375 "env": { 333 "env": {
376 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 334 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
377 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 335 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
378 }, 336 },
379 "name": "device_status (2)", 337 "name": "device_status_check (2)",
380 "~followup_annotations": [ 338 "~followup_annotations": [
381 "@@@STEP_TEXT@Online devices: 1@@@", 339 "@@@STEP_TEXT@Online devices: 1@@@",
382 "@@@STEP_LOG_LINE@json.output@[@@@", 340 "@@@STEP_LOG_LINE@json.output@[@@@",
383 "@@@STEP_LOG_LINE@json.output@ {@@@", 341 "@@@STEP_LOG_LINE@json.output@ {@@@",
384 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@", 342 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
385 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", 343 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
386 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", 344 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
387 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", 345 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
388 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@", 346 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
389 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@", 347 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 608 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
651 }, 609 },
652 "name": "stack_tool_for_asan" 610 "name": "stack_tool_for_asan"
653 }, 611 },
654 { 612 {
655 "name": "$result", 613 "name": "$result",
656 "recipe_result": null, 614 "recipe_result": null,
657 "status_code": 0 615 "status_code": 0
658 } 616 }
659 ] 617 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices_during_status.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698