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

Side by Side Diff: scripts/slave/recipes/chromium.expected/kitchen_path_config.json

Issue 2100153002: chromium_tests: remove unnecessary path component from cache checkout path (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
« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/api.py ('k') | no next file » | 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 sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os. path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", 6 "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os. path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
7 "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_", 7 "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_",
8 "511" 8 "511"
9 ], 9 ],
10 "name": "makedirs checkout path", 10 "name": "makedirs checkout path",
11 "~followup_annotations": [ 11 "~followup_annotations": [
12 "@@@STEP_LOG_LINE@python.inline@@@@", 12 "@@@STEP_LOG_LINE@python.inline@@@@",
13 "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", 13 "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
14 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", 14 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
15 "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", 15 "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
16 "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", 16 "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
17 "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", 17 "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
(...skipping 22 matching lines...) Expand all
40 "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision \", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"g ot_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/ tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_ revision\"}", 40 "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision \", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"g ot_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/ tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_ revision\"}",
41 "--git-cache-dir", 41 "--git-cache-dir",
42 "[GIT_CACHE]", 42 "[GIT_CACHE]",
43 "--output_json", 43 "--output_json",
44 "/path/to/tmp/json", 44 "/path/to/tmp/json",
45 "--revision", 45 "--revision",
46 "src@HEAD", 46 "src@HEAD",
47 "--force", 47 "--force",
48 "--output_manifest" 48 "--output_manifest"
49 ], 49 ],
50 "cwd": "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_", 50 "cwd": "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_",
51 "env": { 51 "env": {
52 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 52 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
53 }, 53 },
54 "name": "bot_update", 54 "name": "bot_update",
55 "~followup_annotations": [ 55 "~followup_annotations": [
56 "@@@STEP_TEXT@Some step text@@@", 56 "@@@STEP_TEXT@Some step text@@@",
57 "@@@STEP_LOG_LINE@json.output@{@@@", 57 "@@@STEP_LOG_LINE@json.output@{@@@",
58 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", 58 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
59 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", 59 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
60 "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", 60 "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 "@@@STEP_LOG_LINE@json.output@ }@@@", 178 "@@@STEP_LOG_LINE@json.output@ }@@@",
179 "@@@STEP_LOG_LINE@json.output@ ]@@@", 179 "@@@STEP_LOG_LINE@json.output@ ]@@@",
180 "@@@STEP_LOG_LINE@json.output@}@@@", 180 "@@@STEP_LOG_LINE@json.output@}@@@",
181 "@@@STEP_LOG_END@json.output@@@" 181 "@@@STEP_LOG_END@json.output@@@"
182 ] 182 ]
183 }, 183 },
184 { 184 {
185 "cmd": [ 185 "cmd": [
186 "python", 186 "python",
187 "-u", 187 "-u",
188 "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/tools/swarming_ client/swarming.py", 188 "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/tools/swarming_client/swa rming.py",
189 "--version" 189 "--version"
190 ], 190 ],
191 "name": "swarming.py --version", 191 "name": "swarming.py --version",
192 "stdout": "/path/to/tmp/", 192 "stdout": "/path/to/tmp/",
193 "~followup_annotations": [ 193 "~followup_annotations": [
194 "@@@STEP_TEXT@0.4.10@@@" 194 "@@@STEP_TEXT@0.4.10@@@"
195 ] 195 ]
196 }, 196 },
197 { 197 {
198 "cmd": [ 198 "cmd": [
199 "python", 199 "python",
200 "-u", 200 "-u",
201 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 201 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
202 "runhooks" 202 "runhooks"
203 ], 203 ],
204 "cwd": "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src", 204 "cwd": "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src",
205 "env": { 205 "env": {
206 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 206 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
207 "GYP_CHROMIUM_NO_ACTION": "1", 207 "GYP_CHROMIUM_NO_ACTION": "1",
208 "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_brandi ng=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_ isolation_mode=prepare use_goma=1", 208 "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_brandi ng=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_ isolation_mode=prepare use_goma=1",
209 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 209 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
210 }, 210 },
211 "name": "gclient runhooks" 211 "name": "gclient runhooks"
212 }, 212 },
213 { 213 {
214 "cmd": [ 214 "cmd": [
215 "python", 215 "python",
216 "-u", 216 "-u",
217 "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/testing/scripts /get_compile_targets.py", 217 "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/testing/scripts/get_compi le_targets.py",
218 "--output", 218 "--output",
219 "/path/to/tmp/json", 219 "/path/to/tmp/json",
220 "--", 220 "--",
221 "--build-config-fs", 221 "--build-config-fs",
222 "Release", 222 "Release",
223 "--paths", 223 "--paths",
224 "{\"checkout\": \"[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/sr c\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runt est.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", 224 "{\"checkout\": \"[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src\", \"run it.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
225 "--properties", 225 "--properties",
226 "{\"buildername\": \"Linux Kitchen (kitchen_run)\", \"buildnumber\": \"774 57\", \"mastername\": \"chromium.fyi\", \"slavename\": \"build1-a1\", \"target_p latform\": \"linux\"}" 226 "{\"buildername\": \"Linux Kitchen (kitchen_run)\", \"buildnumber\": \"774 57\", \"mastername\": \"chromium.fyi\", \"slavename\": \"build1-a1\", \"target_p latform\": \"linux\"}"
227 ], 227 ],
228 "name": "get compile targets for scripts", 228 "name": "get compile targets for scripts",
229 "~followup_annotations": [ 229 "~followup_annotations": [
230 "@@@STEP_LOG_LINE@json.output@{}@@@", 230 "@@@STEP_LOG_LINE@json.output@{}@@@",
231 "@@@STEP_LOG_END@json.output@@@" 231 "@@@STEP_LOG_END@json.output@@@"
232 ] 232 ]
233 }, 233 },
234 { 234 {
235 "cmd": [ 235 "cmd": [
236 "python", 236 "python",
237 "-u", 237 "-u",
238 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", 238 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
239 "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/testing/buildbo t/chromium.fyi.json", 239 "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/testing/buildbot/chromium .fyi.json",
240 "/path/to/tmp/json" 240 "/path/to/tmp/json"
241 ], 241 ],
242 "name": "read test spec (chromium.fyi.json)", 242 "name": "read test spec (chromium.fyi.json)",
243 "~followup_annotations": [ 243 "~followup_annotations": [
244 "@@@STEP_TEXT@path: [BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/ src/testing/buildbot/chromium.fyi.json@@@", 244 "@@@STEP_TEXT@path: [BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/testin g/buildbot/chromium.fyi.json@@@",
245 "@@@STEP_LOG_LINE@json.output@{}@@@", 245 "@@@STEP_LOG_LINE@json.output@{}@@@",
246 "@@@STEP_LOG_END@json.output@@@" 246 "@@@STEP_LOG_END@json.output@@@"
247 ] 247 ]
248 }, 248 },
249 { 249 {
250 "cmd": [ 250 "cmd": [
251 "python", 251 "python",
252 "-u", 252 "-u",
253 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", 253 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
254 "--show-path", 254 "--show-path",
255 "python", 255 "python",
256 "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" 256 "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
257 ], 257 ],
258 "name": "cleanup_temp" 258 "name": "cleanup_temp"
259 }, 259 },
260 { 260 {
261 "cmd": [ 261 "cmd": [
262 "python", 262 "python",
263 "-u", 263 "-u",
264 "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/tools/mb/mb.py" , 264 "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/tools/mb/mb.py",
265 "gen", 265 "gen",
266 "-m", 266 "-m",
267 "chromium.fyi", 267 "chromium.fyi",
268 "-b", 268 "-b",
269 "Linux Kitchen (kitchen_run)", 269 "Linux Kitchen (kitchen_run)",
270 "--config-file", 270 "--config-file",
271 "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/tools/mb/mb_con fig.pyl", 271 "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/tools/mb/mb_config.pyl",
272 "--goma-dir", 272 "--goma-dir",
273 "[CACHE]/cipd/goma", 273 "[CACHE]/cipd/goma",
274 "//out/Release" 274 "//out/Release"
275 ], 275 ],
276 "env": { 276 "env": {
277 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 277 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
278 }, 278 },
279 "name": "generate_build_files" 279 "name": "generate_build_files"
280 }, 280 },
281 { 281 {
282 "cmd": [ 282 "cmd": [
283 "python", 283 "python",
284 "-u", 284 "-u",
285 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", 285 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
286 "--show-path", 286 "--show-path",
287 "python", 287 "python",
288 "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py", 288 "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
289 "--gsutil-py-path", 289 "--gsutil-py-path",
290 "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", 290 "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
291 "--ninja-path", 291 "--ninja-path",
292 "RECIPE_PACKAGE_REPO[depot_tools]/ninja", 292 "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
293 "--target", 293 "--target",
294 "Release", 294 "Release",
295 "--src-dir", 295 "--src-dir",
296 "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src", 296 "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src",
297 "--goma-cache-dir", 297 "--goma-cache-dir",
298 "[GOMA_CACHE]", 298 "[GOMA_CACHE]",
299 "--goma-deps-cache-dir", 299 "--goma-deps-cache-dir",
300 "[GOMA_DEPS_CACHE]", 300 "[GOMA_DEPS_CACHE]",
301 "--build-tool", 301 "--build-tool",
302 "ninja", 302 "ninja",
303 "--compiler", 303 "--compiler",
304 "goma", 304 "goma",
305 "--goma-jsonstatus", 305 "--goma-jsonstatus",
306 "/path/to/tmp/json", 306 "/path/to/tmp/json",
(...skipping 13 matching lines...) Expand all
320 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", 320 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
321 "@@@STEP_LOG_END@json.output (invalid)@@@" 321 "@@@STEP_LOG_END@json.output (invalid)@@@"
322 ] 322 ]
323 }, 323 },
324 { 324 {
325 "name": "$result", 325 "name": "$result",
326 "recipe_result": null, 326 "recipe_result": null,
327 "status_code": 0 327 "status_code": 0
328 } 328 }
329 ] 329 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/api.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698