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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipe_modules/chromium_android/example.expected/slow_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/result_details_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/specific_install_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 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: 1@@@", 289 "@@@STEP_TEXT@Online devices: 1@@@",
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@ \"adb_status\": \"device\", @@@", 292 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
334 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", 293 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
335 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", 294 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
336 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", 295 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
337 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@", 296 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
338 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@", 297 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device \", @@@", 375 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device \", @@@",
417 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @ @@", 376 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @ @@",
418 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00 3c6ad6\", @@@", 377 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00 3c6ad6\", @@@",
419 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@" , 378 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@" ,
420 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@", 379 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
421 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" 380 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
422 ] 381 ]
423 }, 382 },
424 { 383 {
425 "cmd": [ 384 "cmd": [
426 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 385 "python",
386 "-u",
387 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
388 "--adb-path",
389 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
427 "--blacklist-file", 390 "--blacklist-file",
428 "[SLAVE_BUILD]/src/out/bad_devices.json", 391 "[SLAVE_BUILD]/src/out/bad_devices.json",
429 "--known-devices-file", 392 "--output-device-blacklist",
430 "[CACHE]/known_android_devices", 393 "/path/to/tmp/json",
431 "--adb-path", 394 "-t",
432 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 395 "Release"
433 "-v"
434 ], 396 ],
435 "env": { 397 "env": {
436 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 398 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
437 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 399 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
438 }, 400 },
439 "name": "device_recovery (2)" 401 "name": "provision_devices"
440 }, 402 },
441 { 403 {
442 "cmd": [ 404 "cmd": [
443 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_s tatus.py", 405 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
406 "--adb-path",
407 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
408 "--blacklist-file",
409 "[SLAVE_BUILD]/src/out/bad_devices.json",
444 "--json-output", 410 "--json-output",
445 "/path/to/tmp/json", 411 "/path/to/tmp/json",
446 "--blacklist-file",
447 "[SLAVE_BUILD]/src/out/bad_devices.json",
448 "--known-devices-file", 412 "--known-devices-file",
449 "[CACHE]/known_android_devices", 413 "[CACHE]/known_android_devices"
450 "--buildbot-path",
451 "/home/chrome-bot/.adb_device_info",
452 "--adb-path",
453 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
454 "-v",
455 "--overwrite-known-devices-files"
456 ], 414 ],
457 "env": { 415 "env": {
458 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 416 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
459 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 417 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
460 }, 418 },
461 "name": "device_status (2)", 419 "name": "device_status_check (2)",
462 "~followup_annotations": [ 420 "~followup_annotations": [
463 "@@@STEP_TEXT@Online devices: 1@@@", 421 "@@@STEP_TEXT@Online devices: 1@@@",
464 "@@@STEP_LOG_LINE@json.output@[@@@", 422 "@@@STEP_LOG_LINE@json.output@[@@@",
465 "@@@STEP_LOG_LINE@json.output@ {@@@", 423 "@@@STEP_LOG_LINE@json.output@ {@@@",
466 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@", 424 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
467 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", 425 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
468 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", 426 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
469 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", 427 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
470 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@", 428 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
471 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@", 429 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 692 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
735 }, 693 },
736 "name": "stack_tool_for_asan" 694 "name": "stack_tool_for_asan"
737 }, 695 },
738 { 696 {
739 "name": "$result", 697 "name": "$result",
740 "recipe_result": null, 698 "recipe_result": null,
741 "status_code": 0 699 "status_code": 0
742 } 700 }
743 ] 701 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/result_details_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/specific_install_tester_basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698