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

Side by Side Diff: scripts/slave/recipes/cronet.expected/android_cronet_x86_builder.json

Issue 1115453002: Recipes: make cwd default to slave_build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: rebase Created 5 years, 7 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 "cwd": "[SLAVE_BUILD]",
9 "name": "cleanup index.lock", 10 "name": "cleanup index.lock",
10 "~followup_annotations": [ 11 "~followup_annotations": [
11 "@@@STEP_LOG_LINE@python.inline@@@@", 12 "@@@STEP_LOG_LINE@python.inline@@@@",
12 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", 13 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
13 "@@@STEP_LOG_LINE@python.inline@@@@", 14 "@@@STEP_LOG_LINE@python.inline@@@@",
14 "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@", 15 "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@",
15 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@", 16 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@",
16 "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_ path):@@@", 17 "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_ path):@@@",
17 "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@", 18 "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@",
18 "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@ @@", 19 "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@ @@",
(...skipping 18 matching lines...) Expand all
37 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True , 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarg et_os = ['android']", 38 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True , 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarg et_os = ['android']",
38 "--root", 39 "--root",
39 "src", 40 "src",
40 "--revision_mapping_file", 41 "--revision_mapping_file",
41 "{}", 42 "{}",
42 "--output_json", 43 "--output_json",
43 "/path/to/tmp/json", 44 "/path/to/tmp/json",
44 "--revision", 45 "--revision",
45 "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00" 46 "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00"
46 ], 47 ],
48 "cwd": "[SLAVE_BUILD]",
47 "name": "bot_update", 49 "name": "bot_update",
48 "~followup_annotations": [ 50 "~followup_annotations": [
49 "@@@STEP_LOG_LINE@json.output@{@@@", 51 "@@@STEP_LOG_LINE@json.output@{@@@",
50 "@@@STEP_LOG_LINE@json.output@ \"did_run\": false, @@@", 52 "@@@STEP_LOG_LINE@json.output@ \"did_run\": false, @@@",
51 "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false@@@", 53 "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false@@@",
52 "@@@STEP_LOG_LINE@json.output@}@@@", 54 "@@@STEP_LOG_LINE@json.output@}@@@",
53 "@@@STEP_LOG_END@json.output@@@" 55 "@@@STEP_LOG_END@json.output@@@"
54 ] 56 ]
55 }, 57 },
56 { 58 {
57 "cmd": [ 59 "cmd": [
58 "python", 60 "python",
59 "-u", 61 "-u",
60 "[DEPOT_TOOLS]/gclient.py", 62 "[DEPOT_TOOLS]/gclient.py",
61 "config", 63 "config",
62 "--spec", 64 "--spec",
63 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True , 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarg et_os = ['android']" 65 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True , 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarg et_os = ['android']"
64 ], 66 ],
67 "cwd": "[SLAVE_BUILD]",
65 "name": "gclient setup" 68 "name": "gclient setup"
66 }, 69 },
67 { 70 {
68 "cmd": [ 71 "cmd": [
69 "python", 72 "python",
70 "-u", 73 "-u",
71 "[DEPOT_TOOLS]/gclient.py", 74 "[DEPOT_TOOLS]/gclient.py",
72 "sync", 75 "sync",
73 "--nohooks", 76 "--nohooks",
74 "--force", 77 "--force",
75 "--verbose", 78 "--verbose",
76 "--delete_unversioned_trees", 79 "--delete_unversioned_trees",
77 "--revision", 80 "--revision",
78 "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00", 81 "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00",
79 "--output-json", 82 "--output-json",
80 "/path/to/tmp/json" 83 "/path/to/tmp/json"
81 ], 84 ],
85 "cwd": "[SLAVE_BUILD]",
82 "name": "gclient sync", 86 "name": "gclient sync",
83 "~followup_annotations": [ 87 "~followup_annotations": [
84 "@@@STEP_LOG_LINE@json.output@{@@@", 88 "@@@STEP_LOG_LINE@json.output@{@@@",
85 "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", 89 "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
86 "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@", 90 "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
87 "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@", 91 "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
88 "@@@STEP_LOG_LINE@json.output@ }, @@@", 92 "@@@STEP_LOG_LINE@json.output@ }, @@@",
89 "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@", 93 "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
90 "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@", 94 "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
91 "@@@STEP_LOG_LINE@json.output@ }, @@@", 95 "@@@STEP_LOG_LINE@json.output@ }, @@@",
(...skipping 23 matching lines...) Expand all
115 { 119 {
116 "cmd": [ 120 "cmd": [
117 "python", 121 "python",
118 "-u", 122 "-u",
119 "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree (sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfo r base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endsw ith('.pyc'):\n os.remove(os.path.join(base, f))\n", 123 "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree (sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfo r base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endsw ith('.pyc'):\n os.remove(os.path.join(base, f))\n",
120 "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", 124 "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
121 "[SLAVE_BUILD]/src/out/Release/test_logs", 125 "[SLAVE_BUILD]/src/out/Release/test_logs",
122 "[SLAVE_BUILD]/src/out/build_product.zip", 126 "[SLAVE_BUILD]/src/out/build_product.zip",
123 "[SLAVE_BUILD]/src" 127 "[SLAVE_BUILD]/src"
124 ], 128 ],
129 "cwd": "[SLAVE_BUILD]",
125 "name": "clean local files", 130 "name": "clean local files",
126 "~followup_annotations": [ 131 "~followup_annotations": [
127 "@@@STEP_LOG_LINE@python.inline@@@@", 132 "@@@STEP_LOG_LINE@python.inline@@@@",
128 "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", 133 "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
129 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", 134 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
130 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", 135 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
131 "@@@STEP_LOG_LINE@python.inline@try:@@@", 136 "@@@STEP_LOG_LINE@python.inline@try:@@@",
132 "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@", 137 "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
133 "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", 138 "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
134 "@@@STEP_LOG_LINE@python.inline@ pass@@@", 139 "@@@STEP_LOG_LINE@python.inline@ pass@@@",
135 "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv [4]):@@@", 140 "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv [4]):@@@",
136 "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@", 141 "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
137 "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@", 142 "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
138 "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@" , 143 "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@" ,
139 "@@@STEP_LOG_END@python.inline@@@" 144 "@@@STEP_LOG_END@python.inline@@@"
140 ] 145 ]
141 }, 146 },
142 { 147 {
143 "cmd": [ 148 "cmd": [
144 "python", 149 "python",
145 "-u", 150 "-u",
146 "[DEPOT_TOOLS]/gclient.py", 151 "[DEPOT_TOOLS]/gclient.py",
147 "runhooks" 152 "runhooks"
148 ], 153 ],
154 "cwd": "[SLAVE_BUILD]",
149 "env": { 155 "env": {
150 "GYP_DEFINES": "OS=android component=static_library disable_file_support=1 disable_ftp_support=1 enable_websockets=0 fastbuild=1 gomadir='[BUILD]/goma' ta rget_arch=ia32 use_goma=1 use_icu_alternatives_on_android=1", 156 "GYP_DEFINES": "OS=android component=static_library disable_file_support=1 disable_ftp_support=1 enable_websockets=0 fastbuild=1 gomadir='[BUILD]/goma' ta rget_arch=ia32 use_goma=1 use_icu_alternatives_on_android=1",
151 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 157 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
152 }, 158 },
153 "name": "gclient runhooks" 159 "name": "gclient runhooks"
154 }, 160 },
155 { 161 {
156 "cmd": [ 162 "cmd": [
157 "python", 163 "python",
158 "-u", 164 "-u",
159 "[BUILD]/scripts/slave/compile.py", 165 "[BUILD]/scripts/slave/compile.py",
160 "--target", 166 "--target",
161 "Release", 167 "Release",
162 "--src-dir", 168 "--src-dir",
163 "[SLAVE_BUILD]/src", 169 "[SLAVE_BUILD]/src",
164 "--build-tool", 170 "--build-tool",
165 "ninja", 171 "ninja",
166 "--compiler", 172 "--compiler",
167 "goma", 173 "goma",
168 "--goma-dir", 174 "--goma-dir",
169 "[BUILD]/goma", 175 "[BUILD]/goma",
170 "--clobber", 176 "--clobber",
171 "--", 177 "--",
172 "cronet_package", 178 "cronet_package",
173 "cronet_sample_test_apk", 179 "cronet_sample_test_apk",
174 "cronet_test_instrumentation_apk" 180 "cronet_test_instrumentation_apk"
175 ], 181 ],
182 "cwd": "[SLAVE_BUILD]",
176 "env": { 183 "env": {
177 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 184 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
178 }, 185 },
179 "name": "compile" 186 "name": "compile"
180 }, 187 },
181 { 188 {
182 "cmd": [ 189 "cmd": [
183 "python", 190 "python",
184 "-u", 191 "-u",
185 "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py", 192 "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
186 "--", 193 "--",
187 "[DEPOT_TOOLS]/gsutil.py", 194 "[DEPOT_TOOLS]/gsutil.py",
188 "--force-version", 195 "--force-version",
189 "3.25", 196 "3.25",
190 "--", 197 "--",
191 "cp", 198 "cp",
192 "[SLAVE_BUILD]/src/out/Release/cronet/VERSION", 199 "[SLAVE_BUILD]/src/out/Release/cronet/VERSION",
193 "gs://chromium-cronet/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc 8ad589c8a00/VERSION" 200 "gs://chromium-cronet/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc 8ad589c8a00/VERSION"
194 ], 201 ],
202 "cwd": "[SLAVE_BUILD]",
195 "name": "gsutil upload_cronet_version", 203 "name": "gsutil upload_cronet_version",
196 "~followup_annotations": [ 204 "~followup_annotations": [
197 "@@@STEP_LINK@Cronet version@https://storage.cloud.google.com/chromium-cro net/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00/VERSION@@@" 205 "@@@STEP_LINK@Cronet version@https://storage.cloud.google.com/chromium-cro net/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00/VERSION@@@"
198 ] 206 ]
199 }, 207 },
200 { 208 {
201 "cmd": [ 209 "cmd": [
202 "python", 210 "python",
203 "-u", 211 "-u",
204 "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py", 212 "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
205 "--", 213 "--",
206 "[DEPOT_TOOLS]/gsutil.py", 214 "[DEPOT_TOOLS]/gsutil.py",
207 "--force-version", 215 "--force-version",
208 "3.25", 216 "3.25",
209 "--", 217 "--",
210 "cp", 218 "cp",
211 "-R", 219 "-R",
212 "[SLAVE_BUILD]/src/out/Release/cronet", 220 "[SLAVE_BUILD]/src/out/Release/cronet",
213 "gs://chromium-cronet/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc 8ad589c8a00" 221 "gs://chromium-cronet/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc 8ad589c8a00"
214 ], 222 ],
223 "cwd": "[SLAVE_BUILD]",
215 "name": "gsutil upload_cronet_package", 224 "name": "gsutil upload_cronet_package",
216 "~followup_annotations": [ 225 "~followup_annotations": [
217 "@@@STEP_LINK@Cronet package@https://storage.cloud.google.com/chromium-cro net/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00@@@" 226 "@@@STEP_LINK@Cronet package@https://storage.cloud.google.com/chromium-cro net/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00@@@"
218 ] 227 ]
219 } 228 }
220 ] 229 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698