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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipe_modules/chromium_android/example.expected/basic_builder_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.py ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/coverage_builder_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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" 282 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
283 ], 283 ],
284 "env": { 284 "env": {
285 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 285 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
286 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 286 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
287 }, 287 },
288 "name": "authorize_adb_devices" 288 "name": "authorize_adb_devices"
289 }, 289 },
290 { 290 {
291 "cmd": [ 291 "cmd": [
292 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 292 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
293 "--adb-path",
294 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
293 "--blacklist-file", 295 "--blacklist-file",
294 "[SLAVE_BUILD]/src/out/bad_devices.json", 296 "[SLAVE_BUILD]/src/out/bad_devices.json",
297 "--json-output",
298 "/path/to/tmp/json",
295 "--known-devices-file", 299 "--known-devices-file",
296 "[CACHE]/known_android_devices", 300 "[CACHE]/known_android_devices"
297 "--adb-path",
298 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
299 "-v"
300 ], 301 ],
301 "env": { 302 "env": {
302 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 303 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
303 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 304 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
304 }, 305 },
305 "name": "device_recovery" 306 "name": "device_status_check",
306 },
307 {
308 "cmd": [
309 "python",
310 "-u",
311 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
312 "--adb-path",
313 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
314 "--blacklist-file",
315 "[SLAVE_BUILD]/src/out/bad_devices.json",
316 "--output-device-blacklist",
317 "/path/to/tmp/json",
318 "-t",
319 "Release"
320 ],
321 "env": {
322 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
323 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
324 },
325 "name": "provision_devices"
326 },
327 {
328 "cmd": [
329 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_s tatus.py",
330 "--json-output",
331 "/path/to/tmp/json",
332 "--blacklist-file",
333 "[SLAVE_BUILD]/src/out/bad_devices.json",
334 "--known-devices-file",
335 "[CACHE]/known_android_devices",
336 "--buildbot-path",
337 "/home/chrome-bot/.adb_device_info",
338 "--adb-path",
339 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
340 "-v",
341 "--overwrite-known-devices-files"
342 ],
343 "env": {
344 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
345 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
346 },
347 "name": "device_status",
348 "~followup_annotations": [ 307 "~followup_annotations": [
349 "@@@STEP_TEXT@Online devices: 1@@@", 308 "@@@STEP_TEXT@Online devices: 1@@@",
350 "@@@STEP_LOG_LINE@json.output@[@@@", 309 "@@@STEP_LOG_LINE@json.output@[@@@",
351 "@@@STEP_LOG_LINE@json.output@ {@@@", 310 "@@@STEP_LOG_LINE@json.output@ {@@@",
352 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@", 311 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
353 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", 312 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
354 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", 313 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
355 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", 314 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
356 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@", 315 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
357 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@", 316 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device \", @@@", 394 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device \", @@@",
436 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @ @@", 395 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @ @@",
437 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00 3c6ad6\", @@@", 396 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00 3c6ad6\", @@@",
438 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@" , 397 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@" ,
439 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@", 398 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
440 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" 399 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
441 ] 400 ]
442 }, 401 },
443 { 402 {
444 "cmd": [ 403 "cmd": [
445 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 404 "python",
405 "-u",
406 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
407 "--adb-path",
408 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
446 "--blacklist-file", 409 "--blacklist-file",
447 "[SLAVE_BUILD]/src/out/bad_devices.json", 410 "[SLAVE_BUILD]/src/out/bad_devices.json",
448 "--known-devices-file", 411 "--output-device-blacklist",
449 "[CACHE]/known_android_devices", 412 "/path/to/tmp/json",
450 "--adb-path", 413 "-t",
451 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 414 "Release"
452 "-v"
453 ], 415 ],
454 "env": { 416 "env": {
455 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 417 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
456 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 418 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
457 }, 419 },
458 "name": "device_recovery (2)" 420 "name": "provision_devices"
459 }, 421 },
460 { 422 {
461 "cmd": [ 423 "cmd": [
462 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_s tatus.py", 424 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
425 "--adb-path",
426 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
427 "--blacklist-file",
428 "[SLAVE_BUILD]/src/out/bad_devices.json",
463 "--json-output", 429 "--json-output",
464 "/path/to/tmp/json", 430 "/path/to/tmp/json",
465 "--blacklist-file",
466 "[SLAVE_BUILD]/src/out/bad_devices.json",
467 "--known-devices-file", 431 "--known-devices-file",
468 "[CACHE]/known_android_devices", 432 "[CACHE]/known_android_devices"
469 "--buildbot-path",
470 "/home/chrome-bot/.adb_device_info",
471 "--adb-path",
472 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
473 "-v",
474 "--overwrite-known-devices-files"
475 ], 433 ],
476 "env": { 434 "env": {
477 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 435 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
478 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 436 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
479 }, 437 },
480 "name": "device_status (2)", 438 "name": "device_status_check (2)",
481 "~followup_annotations": [ 439 "~followup_annotations": [
482 "@@@STEP_TEXT@Online devices: 1@@@", 440 "@@@STEP_TEXT@Online devices: 1@@@",
483 "@@@STEP_LOG_LINE@json.output@[@@@", 441 "@@@STEP_LOG_LINE@json.output@[@@@",
484 "@@@STEP_LOG_LINE@json.output@ {@@@", 442 "@@@STEP_LOG_LINE@json.output@ {@@@",
485 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@", 443 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
486 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", 444 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
487 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", 445 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
488 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", 446 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
489 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@", 447 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
490 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@", 448 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 709 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
752 }, 710 },
753 "name": "stack_tool_for_asan" 711 "name": "stack_tool_for_asan"
754 }, 712 },
755 { 713 {
756 "name": "$result", 714 "name": "$result",
757 "recipe_result": null, 715 "recipe_result": null,
758 "status_code": 0 716 "status_code": 0
759 } 717 }
760 ] 718 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.py ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/coverage_builder_basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698