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

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

Issue 2103503002: adb: move known devices file under cache so it works with remote_run (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
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 | Annotate | Revision Log
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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 }, 289 },
290 { 290 {
291 "cmd": [], 291 "cmd": [],
292 "name": "fix_device_file_format" 292 "name": "fix_device_file_format"
293 }, 293 },
294 { 294 {
295 "cmd": [ 295 "cmd": [
296 "python", 296 "python",
297 "-u", 297 "-u",
298 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", 298 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
299 "[BUILD]/site_config/.known_devices", 299 "[CACHE]/known_android_devices",
300 "/path/to/tmp/" 300 "/path/to/tmp/"
301 ], 301 ],
302 "name": "fix_device_file_format.read_device_file", 302 "name": "fix_device_file_format.read_device_file",
303 "~followup_annotations": [ 303 "~followup_annotations": [
304 "@@@STEP_NEST_LEVEL@1@@@", 304 "@@@STEP_NEST_LEVEL@1@@@",
305 "@@@STEP_TEXT@file format is compatible@@@" 305 "@@@STEP_TEXT@file format is compatible@@@"
306 ] 306 ]
307 }, 307 },
308 { 308 {
309 "cmd": [ 309 "cmd": [
310 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py", 310 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
311 "--adb-path", 311 "--adb-path",
312 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 312 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
313 "--blacklist-file", 313 "--blacklist-file",
314 "[SLAVE_BUILD]/src/out/bad_devices.json", 314 "[SLAVE_BUILD]/src/out/bad_devices.json",
315 "--json-output", 315 "--json-output",
316 "/path/to/tmp/json", 316 "/path/to/tmp/json",
317 "--known-devices-file", 317 "--known-devices-file",
318 "[BUILD]/site_config/.known_devices" 318 "[CACHE]/known_android_devices"
319 ], 319 ],
320 "env": { 320 "env": {
321 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 321 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
322 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 322 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
323 }, 323 },
324 "name": "device_status_check", 324 "name": "device_status_check",
325 "~followup_annotations": [ 325 "~followup_annotations": [
326 "@@@STEP_TEXT@Online devices: 1@@@", 326 "@@@STEP_TEXT@Online devices: 1@@@",
327 "@@@STEP_LOG_LINE@json.output@[@@@", 327 "@@@STEP_LOG_LINE@json.output@[@@@",
328 "@@@STEP_LOG_LINE@json.output@ {@@@", 328 "@@@STEP_LOG_LINE@json.output@ {@@@",
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 }, 439 },
440 { 440 {
441 "cmd": [], 441 "cmd": [],
442 "name": "fix_device_file_format (2)" 442 "name": "fix_device_file_format (2)"
443 }, 443 },
444 { 444 {
445 "cmd": [ 445 "cmd": [
446 "python", 446 "python",
447 "-u", 447 "-u",
448 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", 448 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
449 "[BUILD]/site_config/.known_devices", 449 "[CACHE]/known_android_devices",
450 "/path/to/tmp/" 450 "/path/to/tmp/"
451 ], 451 ],
452 "name": "fix_device_file_format.read_device_file (2)", 452 "name": "fix_device_file_format.read_device_file (2)",
453 "~followup_annotations": [ 453 "~followup_annotations": [
454 "@@@STEP_NEST_LEVEL@1@@@", 454 "@@@STEP_NEST_LEVEL@1@@@",
455 "@@@STEP_TEXT@file format is compatible@@@" 455 "@@@STEP_TEXT@file format is compatible@@@"
456 ] 456 ]
457 }, 457 },
458 { 458 {
459 "cmd": [ 459 "cmd": [
460 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py", 460 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
461 "--adb-path", 461 "--adb-path",
462 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 462 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
463 "--blacklist-file", 463 "--blacklist-file",
464 "[SLAVE_BUILD]/src/out/bad_devices.json", 464 "[SLAVE_BUILD]/src/out/bad_devices.json",
465 "--json-output", 465 "--json-output",
466 "/path/to/tmp/json", 466 "/path/to/tmp/json",
467 "--known-devices-file", 467 "--known-devices-file",
468 "[BUILD]/site_config/.known_devices", 468 "[CACHE]/known_android_devices",
469 "--restart-usb" 469 "--restart-usb"
470 ], 470 ],
471 "env": { 471 "env": {
472 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 472 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
473 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 473 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
474 }, 474 },
475 "name": "device_status_check (2)", 475 "name": "device_status_check (2)",
476 "~followup_annotations": [ 476 "~followup_annotations": [
477 "@@@STEP_TEXT@Online devices: 1@@@", 477 "@@@STEP_TEXT@Online devices: 1@@@",
478 "@@@STEP_LOG_LINE@json.output@[@@@", 478 "@@@STEP_LOG_LINE@json.output@[@@@",
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 746 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
747 }, 747 },
748 "name": "stack_tool_for_asan" 748 "name": "stack_tool_for_asan"
749 }, 749 },
750 { 750 {
751 "name": "$result", 751 "name": "$result",
752 "recipe_result": null, 752 "recipe_result": null,
753 "status_code": 0 753 "status_code": 0
754 } 754 }
755 ] 755 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698