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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json

Issue 2099713002: Download the Android SDK as a CIPD package (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@cipd_swarm
Patch Set: Rebase 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
« scripts/slave/recipe_modules/skia/android_flavor.py ('K') | « scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/download_and_push_skimage.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 "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", 6 "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
7 "/path/to/tmp/json", 7 "/path/to/tmp/json",
8 "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" 8 "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
9 ], 9 ],
10 "cwd": "[SLAVE_BUILD]/skia", 10 "cwd": "[SLAVE_BUILD]/skia",
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 "adb" 52 "adb"
53 ], 53 ],
54 "name": "which adb", 54 "name": "which adb",
55 "stdout": "/path/to/tmp/" 55 "stdout": "/path/to/tmp/"
56 }, 56 },
57 { 57 {
58 "cmd": [ 58 "cmd": [
59 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" 59 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
60 ], 60 ],
61 "env": { 61 "env": {
62 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 62 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
63 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 63 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
64 "BUILDTYPE": "Debug", 64 "BUILDTYPE": "Debug",
65 "CHROME_HEADLESS": "1", 65 "CHROME_HEADLESS": "1",
66 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 66 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
67 "PYTHONPATH": "[BUILD]/scripts", 67 "PYTHONPATH": "[BUILD]/scripts",
68 "SKIA_ANDROID_VERBOSE_SETUP": "1", 68 "SKIA_ANDROID_VERBOSE_SETUP": "1",
69 "SKIA_OUT": "[SLAVE_BUILD]/out" 69 "SKIA_OUT": "[SLAVE_BUILD]/out"
70 }, 70 },
71 "name": "wait for device (1)" 71 "name": "wait for device (1)"
72 }, 72 },
73 { 73 {
74 "cmd": [ 74 "cmd": [
75 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" 75 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
76 ], 76 ],
77 "env": { 77 "env": {
78 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 78 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
79 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 79 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
80 "BUILDTYPE": "Debug", 80 "BUILDTYPE": "Debug",
81 "CHROME_HEADLESS": "1", 81 "CHROME_HEADLESS": "1",
82 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 82 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
83 "PYTHONPATH": "[BUILD]/scripts", 83 "PYTHONPATH": "[BUILD]/scripts",
84 "SKIA_ANDROID_VERBOSE_SETUP": "1", 84 "SKIA_ANDROID_VERBOSE_SETUP": "1",
85 "SKIA_OUT": "[SLAVE_BUILD]/out" 85 "SKIA_OUT": "[SLAVE_BUILD]/out"
86 }, 86 },
87 "name": "wait for charge (1)" 87 "name": "wait for charge (1)"
88 }, 88 },
89 { 89 {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 "PYTHONPATH": "[BUILD]/scripts", 130 "PYTHONPATH": "[BUILD]/scripts",
131 "SKIA_OUT": "[SLAVE_BUILD]/out" 131 "SKIA_OUT": "[SLAVE_BUILD]/out"
132 }, 132 },
133 "name": "wait" 133 "name": "wait"
134 }, 134 },
135 { 135 {
136 "cmd": [ 136 "cmd": [
137 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" 137 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
138 ], 138 ],
139 "env": { 139 "env": {
140 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 140 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
141 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 141 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
142 "BUILDTYPE": "Debug", 142 "BUILDTYPE": "Debug",
143 "CHROME_HEADLESS": "1", 143 "CHROME_HEADLESS": "1",
144 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 144 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
145 "PYTHONPATH": "[BUILD]/scripts", 145 "PYTHONPATH": "[BUILD]/scripts",
146 "SKIA_ANDROID_VERBOSE_SETUP": "1", 146 "SKIA_ANDROID_VERBOSE_SETUP": "1",
147 "SKIA_OUT": "[SLAVE_BUILD]/out" 147 "SKIA_OUT": "[SLAVE_BUILD]/out"
148 }, 148 },
149 "name": "wait for device (2)" 149 "name": "wait for device (2)"
150 }, 150 },
151 { 151 {
152 "cmd": [ 152 "cmd": [
153 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" 153 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
154 ], 154 ],
155 "env": { 155 "env": {
156 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 156 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
157 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 157 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
158 "BUILDTYPE": "Debug", 158 "BUILDTYPE": "Debug",
159 "CHROME_HEADLESS": "1", 159 "CHROME_HEADLESS": "1",
160 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 160 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
161 "PYTHONPATH": "[BUILD]/scripts", 161 "PYTHONPATH": "[BUILD]/scripts",
162 "SKIA_ANDROID_VERBOSE_SETUP": "1", 162 "SKIA_ANDROID_VERBOSE_SETUP": "1",
163 "SKIA_OUT": "[SLAVE_BUILD]/out" 163 "SKIA_OUT": "[SLAVE_BUILD]/out"
164 }, 164 },
165 "name": "wait for charge (2)" 165 "name": "wait for charge (2)"
166 }, 166 },
167 { 167 {
168 "cmd": [ 168 "cmd": [
169 "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia", 169 "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia",
170 "--verbose" 170 "--verbose"
171 ], 171 ],
172 "env": { 172 "env": {
173 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 173 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
174 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 174 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
175 "BUILDTYPE": "Debug", 175 "BUILDTYPE": "Debug",
176 "CHROME_HEADLESS": "1", 176 "CHROME_HEADLESS": "1",
177 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 177 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
178 "PYTHONPATH": "[BUILD]/scripts", 178 "PYTHONPATH": "[BUILD]/scripts",
179 "SKIA_ANDROID_VERBOSE_SETUP": "1", 179 "SKIA_ANDROID_VERBOSE_SETUP": "1",
180 "SKIA_OUT": "[SLAVE_BUILD]/out" 180 "SKIA_OUT": "[SLAVE_BUILD]/out"
181 }, 181 },
182 "name": "kill skia" 182 "name": "kill skia"
183 }, 183 },
184 { 184 {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 "name": "cat cpu_freq" 245 "name": "cat cpu_freq"
246 }, 246 },
247 { 247 {
248 "cmd": [ 248 "cmd": [
249 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed", 249 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed",
250 "--verbose", 250 "--verbose",
251 "[SLAVE_BUILD]/skia/resources", 251 "[SLAVE_BUILD]/skia/resources",
252 "/storage/emulated/legacy/skiabot/skia_resources" 252 "/storage/emulated/legacy/skiabot/skia_resources"
253 ], 253 ],
254 "env": { 254 "env": {
255 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 255 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
256 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 256 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
257 "BUILDTYPE": "Debug", 257 "BUILDTYPE": "Debug",
258 "CHROME_HEADLESS": "1", 258 "CHROME_HEADLESS": "1",
259 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 259 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
260 "PYTHONPATH": "[BUILD]/scripts", 260 "PYTHONPATH": "[BUILD]/scripts",
261 "SKIA_ANDROID_VERBOSE_SETUP": "1", 261 "SKIA_ANDROID_VERBOSE_SETUP": "1",
262 "SKIA_OUT": "[SLAVE_BUILD]/out" 262 "SKIA_OUT": "[SLAVE_BUILD]/out"
263 }, 263 },
264 "name": "push resources" 264 "name": "push resources"
265 }, 265 },
266 { 266 {
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 "os", 552 "os",
553 "Android", 553 "Android",
554 "--uninterestingHashesFile", 554 "--uninterestingHashesFile",
555 "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt", 555 "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt",
556 "--writePath", 556 "--writePath",
557 "/storage/emulated/legacy/skiabot/skia_dm", 557 "/storage/emulated/legacy/skiabot/skia_dm",
558 "--nocpu", 558 "--nocpu",
559 "--dummy-flags" 559 "--dummy-flags"
560 ], 560 ],
561 "env": { 561 "env": {
562 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 562 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
563 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 563 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
564 "BUILDTYPE": "Debug", 564 "BUILDTYPE": "Debug",
565 "CHROME_HEADLESS": "1", 565 "CHROME_HEADLESS": "1",
566 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 566 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
567 "PYTHONPATH": "[BUILD]/scripts", 567 "PYTHONPATH": "[BUILD]/scripts",
568 "SKIA_ANDROID_VERBOSE_SETUP": "1", 568 "SKIA_ANDROID_VERBOSE_SETUP": "1",
569 "SKIA_OUT": "[SLAVE_BUILD]/out" 569 "SKIA_OUT": "[SLAVE_BUILD]/out"
570 }, 570 },
571 "name": "dm" 571 "name": "dm"
572 }, 572 },
573 { 573 {
574 "cmd": [ 574 "cmd": [
575 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed", 575 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed",
576 "--verbose", 576 "--verbose",
577 "/storage/emulated/legacy/skiabot/skia_dm", 577 "/storage/emulated/legacy/skiabot/skia_dm",
578 "[CUSTOM_[SWARM_OUT_DIR]]/dm" 578 "[CUSTOM_[SWARM_OUT_DIR]]/dm"
579 ], 579 ],
580 "env": { 580 "env": {
581 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 581 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
582 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 582 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
583 "BUILDTYPE": "Debug", 583 "BUILDTYPE": "Debug",
584 "CHROME_HEADLESS": "1", 584 "CHROME_HEADLESS": "1",
585 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 585 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
586 "PYTHONPATH": "[BUILD]/scripts", 586 "PYTHONPATH": "[BUILD]/scripts",
587 "SKIA_ANDROID_VERBOSE_SETUP": "1", 587 "SKIA_ANDROID_VERBOSE_SETUP": "1",
588 "SKIA_OUT": "[SLAVE_BUILD]/out" 588 "SKIA_OUT": "[SLAVE_BUILD]/out"
589 }, 589 },
590 "name": "pull skia_dm" 590 "name": "pull skia_dm"
591 }, 591 },
592 { 592 {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 "PYTHONPATH": "[BUILD]/scripts", 631 "PYTHONPATH": "[BUILD]/scripts",
632 "SKIA_OUT": "[SLAVE_BUILD]/out" 632 "SKIA_OUT": "[SLAVE_BUILD]/out"
633 }, 633 },
634 "name": "wait for reboot" 634 "name": "wait for reboot"
635 }, 635 },
636 { 636 {
637 "cmd": [ 637 "cmd": [
638 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" 638 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
639 ], 639 ],
640 "env": { 640 "env": {
641 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 641 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
642 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 642 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
643 "BUILDTYPE": "Debug", 643 "BUILDTYPE": "Debug",
644 "CHROME_HEADLESS": "1", 644 "CHROME_HEADLESS": "1",
645 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 645 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
646 "PYTHONPATH": "[BUILD]/scripts", 646 "PYTHONPATH": "[BUILD]/scripts",
647 "SKIA_ANDROID_VERBOSE_SETUP": "1", 647 "SKIA_ANDROID_VERBOSE_SETUP": "1",
648 "SKIA_OUT": "[SLAVE_BUILD]/out" 648 "SKIA_OUT": "[SLAVE_BUILD]/out"
649 }, 649 },
650 "name": "wait for device (3)" 650 "name": "wait for device (3)"
651 }, 651 },
652 { 652 {
653 "cmd": [ 653 "cmd": [
654 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" 654 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
655 ], 655 ],
656 "env": { 656 "env": {
657 "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk", 657 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
658 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk", 658 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
659 "BUILDTYPE": "Debug", 659 "BUILDTYPE": "Debug",
660 "CHROME_HEADLESS": "1", 660 "CHROME_HEADLESS": "1",
661 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 661 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
662 "PYTHONPATH": "[BUILD]/scripts", 662 "PYTHONPATH": "[BUILD]/scripts",
663 "SKIA_ANDROID_VERBOSE_SETUP": "1", 663 "SKIA_ANDROID_VERBOSE_SETUP": "1",
664 "SKIA_OUT": "[SLAVE_BUILD]/out" 664 "SKIA_OUT": "[SLAVE_BUILD]/out"
665 }, 665 },
666 "name": "wait for charge (3)" 666 "name": "wait for charge (3)"
667 }, 667 },
668 { 668 {
669 "cmd": [ 669 "cmd": [
670 "/usr/bin/adb", 670 "/usr/bin/adb",
671 "kill-server" 671 "kill-server"
672 ], 672 ],
673 "env": { 673 "env": {
674 "BUILDTYPE": "Debug", 674 "BUILDTYPE": "Debug",
675 "CHROME_HEADLESS": "1", 675 "CHROME_HEADLESS": "1",
676 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", 676 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
677 "PYTHONPATH": "[BUILD]/scripts", 677 "PYTHONPATH": "[BUILD]/scripts",
678 "SKIA_OUT": "[SLAVE_BUILD]/out" 678 "SKIA_OUT": "[SLAVE_BUILD]/out"
679 }, 679 },
680 "name": "kill-server" 680 "name": "kill-server"
681 }, 681 },
682 { 682 {
683 "name": "$result", 683 "name": "$result",
684 "recipe_result": null, 684 "recipe_result": null,
685 "status_code": 0 685 "status_code": 0
686 } 686 }
687 ] 687 ]
OLDNEW
« scripts/slave/recipe_modules/skia/android_flavor.py ('K') | « scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/download_and_push_skimage.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698