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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipe_modules/chromium_android/example.expected/specific_install_tester_basic.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/slow_tester_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/tester_basic.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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" 292 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
293 ], 293 ],
294 "env": { 294 "env": {
295 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 295 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
296 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 296 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
297 }, 297 },
298 "name": "authorize_adb_devices" 298 "name": "authorize_adb_devices"
299 }, 299 },
300 { 300 {
301 "cmd": [ 301 "cmd": [
302 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 302 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
303 "--adb-path",
304 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
303 "--blacklist-file", 305 "--blacklist-file",
304 "[SLAVE_BUILD]/src/out/bad_devices.json", 306 "[SLAVE_BUILD]/src/out/bad_devices.json",
307 "--json-output",
308 "/path/to/tmp/json",
305 "--known-devices-file", 309 "--known-devices-file",
306 "[CACHE]/known_android_devices", 310 "[CACHE]/known_android_devices"
307 "--adb-path",
308 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
309 "-v"
310 ], 311 ],
311 "env": { 312 "env": {
312 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 313 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
313 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 314 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
314 }, 315 },
315 "name": "device_recovery" 316 "name": "device_status_check",
316 },
317 {
318 "cmd": [
319 "python",
320 "-u",
321 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
322 "--adb-path",
323 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
324 "--blacklist-file",
325 "[SLAVE_BUILD]/src/out/bad_devices.json",
326 "--output-device-blacklist",
327 "/path/to/tmp/json",
328 "-t",
329 "Release"
330 ],
331 "env": {
332 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
333 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
334 },
335 "name": "provision_devices"
336 },
337 {
338 "cmd": [
339 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_s tatus.py",
340 "--json-output",
341 "/path/to/tmp/json",
342 "--blacklist-file",
343 "[SLAVE_BUILD]/src/out/bad_devices.json",
344 "--known-devices-file",
345 "[CACHE]/known_android_devices",
346 "--buildbot-path",
347 "/home/chrome-bot/.adb_device_info",
348 "--adb-path",
349 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
350 "-v",
351 "--overwrite-known-devices-files"
352 ],
353 "env": {
354 "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"
356 },
357 "name": "device_status",
358 "~followup_annotations": [ 317 "~followup_annotations": [
359 "@@@STEP_TEXT@Online devices: 1@@@", 318 "@@@STEP_TEXT@Online devices: 1@@@",
360 "@@@STEP_LOG_LINE@json.output@[@@@", 319 "@@@STEP_LOG_LINE@json.output@[@@@",
361 "@@@STEP_LOG_LINE@json.output@ {@@@", 320 "@@@STEP_LOG_LINE@json.output@ {@@@",
362 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@", 321 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
363 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", 322 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
364 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", 323 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
365 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", 324 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
366 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@", 325 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
367 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@", 326 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device \", @@@", 404 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device \", @@@",
446 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @ @@", 405 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @ @@",
447 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00 3c6ad6\", @@@", 406 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00 3c6ad6\", @@@",
448 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@" , 407 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@" ,
449 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@", 408 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
450 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" 409 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
451 ] 410 ]
452 }, 411 },
453 { 412 {
454 "cmd": [ 413 "cmd": [
455 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 414 "python",
415 "-u",
416 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
417 "--adb-path",
418 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
456 "--blacklist-file", 419 "--blacklist-file",
457 "[SLAVE_BUILD]/src/out/bad_devices.json", 420 "[SLAVE_BUILD]/src/out/bad_devices.json",
458 "--known-devices-file", 421 "--output-device-blacklist",
459 "[CACHE]/known_android_devices", 422 "/path/to/tmp/json",
460 "--adb-path", 423 "-t",
461 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 424 "Release"
462 "-v"
463 ], 425 ],
464 "env": { 426 "env": {
465 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 427 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
466 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 428 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
467 }, 429 },
468 "name": "device_recovery (2)" 430 "name": "provision_devices"
469 }, 431 },
470 { 432 {
471 "cmd": [ 433 "cmd": [
472 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_s tatus.py", 434 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
435 "--adb-path",
436 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
437 "--blacklist-file",
438 "[SLAVE_BUILD]/src/out/bad_devices.json",
473 "--json-output", 439 "--json-output",
474 "/path/to/tmp/json", 440 "/path/to/tmp/json",
475 "--blacklist-file",
476 "[SLAVE_BUILD]/src/out/bad_devices.json",
477 "--known-devices-file", 441 "--known-devices-file",
478 "[CACHE]/known_android_devices", 442 "[CACHE]/known_android_devices"
479 "--buildbot-path",
480 "/home/chrome-bot/.adb_device_info",
481 "--adb-path",
482 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
483 "-v",
484 "--overwrite-known-devices-files"
485 ], 443 ],
486 "env": { 444 "env": {
487 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 445 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
488 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 446 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
489 }, 447 },
490 "name": "device_status (2)", 448 "name": "device_status_check (2)",
491 "~followup_annotations": [ 449 "~followup_annotations": [
492 "@@@STEP_TEXT@Online devices: 1@@@", 450 "@@@STEP_TEXT@Online devices: 1@@@",
493 "@@@STEP_LOG_LINE@json.output@[@@@", 451 "@@@STEP_LOG_LINE@json.output@[@@@",
494 "@@@STEP_LOG_LINE@json.output@ {@@@", 452 "@@@STEP_LOG_LINE@json.output@ {@@@",
495 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@", 453 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
496 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", 454 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
497 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", 455 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
498 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", 456 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
499 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@", 457 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
500 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@", 458 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 719 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
762 }, 720 },
763 "name": "stack_tool_for_asan" 721 "name": "stack_tool_for_asan"
764 }, 722 },
765 { 723 {
766 "name": "$result", 724 "name": "$result",
767 "recipe_result": null, 725 "recipe_result": null,
768 "status_code": 0 726 "status_code": 0
769 } 727 }
770 ] 728 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/slow_tester_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/tester_basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698