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

Side by Side Diff: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json

Issue 2411243003: Revert of Download the hermetic xcode toolchain on all bots that target mac. (Closed)
Patch Set: Created 4 years, 2 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
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", 6 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
7 "--show-path", 7 "--show-path",
8 "python", 8 "python",
9 "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" 9 "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
10 ], 10 ],
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 }, 205 },
206 { 206 {
207 "cmd": [ 207 "cmd": [
208 "python", 208 "python",
209 "-u", 209 "-u",
210 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 210 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
211 "runhooks" 211 "runhooks"
212 ], 212 ],
213 "cwd": "[SLAVE_BUILD]/src", 213 "cwd": "[SLAVE_BUILD]/src",
214 "env": { 214 "env": {
215 "FORCE_MAC_TOOLCHAIN": "1",
216 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 215 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
217 "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/gom a' target_arch=ia32 test_isolation_mode=prepare use_goma=1", 216 "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/gom a' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
218 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 217 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
219 }, 218 },
220 "name": "gclient runhooks" 219 "name": "gclient runhooks"
221 }, 220 },
222 { 221 {
223 "cmd": [ 222 "cmd": [
224 "python", 223 "python",
225 "-u", 224 "-u",
226 "[SLAVE_BUILD]/src/tools/mb/mb.py", 225 "[SLAVE_BUILD]/src/tools/mb/mb.py",
227 "gen", 226 "gen",
228 "-m", 227 "-m",
229 "chromium.swarm", 228 "chromium.swarm",
230 "-b", 229 "-b",
231 "Mac deterministic", 230 "Mac deterministic",
232 "--config-file", 231 "--config-file",
233 "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", 232 "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
234 "--goma-dir", 233 "--goma-dir",
235 "[CACHE]/cipd/goma", 234 "[CACHE]/cipd/goma",
236 "//out/Release" 235 "//out/Release"
237 ], 236 ],
238 "cwd": "[SLAVE_BUILD]/src", 237 "cwd": "[SLAVE_BUILD]/src",
239 "env": { 238 "env": {
240 "FORCE_MAC_TOOLCHAIN": "1",
241 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 239 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
242 }, 240 },
243 "name": "generate_build_files" 241 "name": "generate_build_files"
244 }, 242 },
245 { 243 {
246 "allow_subannotations": true, 244 "allow_subannotations": true,
247 "cmd": [ 245 "cmd": [
248 "python", 246 "python",
249 "-u", 247 "-u",
250 "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", 248 "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
251 "--src-dir", 249 "--src-dir",
252 "[SLAVE_BUILD]/src", 250 "[SLAVE_BUILD]/src",
253 "--output-json", 251 "--output-json",
254 "/path/to/tmp/json" 252 "/path/to/tmp/json"
255 ], 253 ],
256 "env": { 254 "env": {
257 "FORCE_MAC_TOOLCHAIN": "1",
258 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 255 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
259 }, 256 },
260 "name": "clang_revision", 257 "name": "clang_revision",
261 "~followup_annotations": [ 258 "~followup_annotations": [
262 "@@@STEP_LOG_LINE@json.output@{@@@", 259 "@@@STEP_LOG_LINE@json.output@{@@@",
263 "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@", 260 "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
264 "@@@STEP_LOG_LINE@json.output@}@@@", 261 "@@@STEP_LOG_LINE@json.output@}@@@",
265 "@@@STEP_LOG_END@json.output@@@" 262 "@@@STEP_LOG_END@json.output@@@"
266 ] 263 ]
267 }, 264 },
(...skipping 28 matching lines...) Expand all
296 "--goma-jsonstatus", 293 "--goma-jsonstatus",
297 "/path/to/tmp/json", 294 "/path/to/tmp/json",
298 "--goma-service-account-json-file", 295 "--goma-service-account-json-file",
299 "/creds/service_accounts/service-account-goma-client.json", 296 "/creds/service_accounts/service-account-goma-client.json",
300 "--goma-dir", 297 "--goma-dir",
301 "[CACHE]/cipd/goma", 298 "[CACHE]/cipd/goma",
302 "--", 299 "--",
303 "all" 300 "all"
304 ], 301 ],
305 "env": { 302 "env": {
306 "FORCE_MAC_TOOLCHAIN": "1",
307 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 303 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
308 }, 304 },
309 "name": "First build", 305 "name": "First build",
310 "~followup_annotations": [ 306 "~followup_annotations": [
311 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", 307 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
312 "@@@STEP_LOG_END@json.output (invalid)@@@" 308 "@@@STEP_LOG_END@json.output (invalid)@@@"
313 ] 309 ]
314 }, 310 },
315 { 311 {
316 "cmd": [ 312 "cmd": [
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 }, 398 },
403 { 399 {
404 "cmd": [ 400 "cmd": [
405 "python", 401 "python",
406 "-u", 402 "-u",
407 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 403 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
408 "runhooks" 404 "runhooks"
409 ], 405 ],
410 "cwd": "[SLAVE_BUILD]/src", 406 "cwd": "[SLAVE_BUILD]/src",
411 "env": { 407 "env": {
412 "FORCE_MAC_TOOLCHAIN": "1",
413 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 408 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
414 "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/gom a' target_arch=ia32 test_isolation_mode=prepare use_goma=1", 409 "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/gom a' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
415 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 410 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
416 }, 411 },
417 "name": "gclient runhooks (2)" 412 "name": "gclient runhooks (2)"
418 }, 413 },
419 { 414 {
420 "cmd": [ 415 "cmd": [
421 "python", 416 "python",
422 "-u", 417 "-u",
423 "[SLAVE_BUILD]/src/tools/mb/mb.py", 418 "[SLAVE_BUILD]/src/tools/mb/mb.py",
424 "gen", 419 "gen",
425 "-m", 420 "-m",
426 "chromium.swarm", 421 "chromium.swarm",
427 "-b", 422 "-b",
428 "Mac deterministic", 423 "Mac deterministic",
429 "--config-file", 424 "--config-file",
430 "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", 425 "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
431 "--goma-dir", 426 "--goma-dir",
432 "[CACHE]/cipd/goma", 427 "[CACHE]/cipd/goma",
433 "//out/Release" 428 "//out/Release"
434 ], 429 ],
435 "cwd": "[SLAVE_BUILD]/src", 430 "cwd": "[SLAVE_BUILD]/src",
436 "env": { 431 "env": {
437 "FORCE_MAC_TOOLCHAIN": "1",
438 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 432 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
439 }, 433 },
440 "name": "generate_build_files (2)" 434 "name": "generate_build_files (2)"
441 }, 435 },
442 { 436 {
443 "allow_subannotations": true, 437 "allow_subannotations": true,
444 "cmd": [ 438 "cmd": [
445 "python", 439 "python",
446 "-u", 440 "-u",
447 "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", 441 "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
448 "--src-dir", 442 "--src-dir",
449 "[SLAVE_BUILD]/src", 443 "[SLAVE_BUILD]/src",
450 "--output-json", 444 "--output-json",
451 "/path/to/tmp/json" 445 "/path/to/tmp/json"
452 ], 446 ],
453 "env": { 447 "env": {
454 "FORCE_MAC_TOOLCHAIN": "1",
455 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 448 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
456 }, 449 },
457 "name": "clang_revision (2)", 450 "name": "clang_revision (2)",
458 "~followup_annotations": [ 451 "~followup_annotations": [
459 "@@@STEP_LOG_LINE@json.output@{@@@", 452 "@@@STEP_LOG_LINE@json.output@{@@@",
460 "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@", 453 "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
461 "@@@STEP_LOG_LINE@json.output@}@@@", 454 "@@@STEP_LOG_LINE@json.output@}@@@",
462 "@@@STEP_LOG_END@json.output@@@" 455 "@@@STEP_LOG_END@json.output@@@"
463 ] 456 ]
464 }, 457 },
(...skipping 28 matching lines...) Expand all
493 "--goma-jsonstatus", 486 "--goma-jsonstatus",
494 "/path/to/tmp/json", 487 "/path/to/tmp/json",
495 "--goma-service-account-json-file", 488 "--goma-service-account-json-file",
496 "/creds/service_accounts/service-account-goma-client.json", 489 "/creds/service_accounts/service-account-goma-client.json",
497 "--goma-dir", 490 "--goma-dir",
498 "[CACHE]/cipd/goma", 491 "[CACHE]/cipd/goma",
499 "--", 492 "--",
500 "all" 493 "all"
501 ], 494 ],
502 "env": { 495 "env": {
503 "FORCE_MAC_TOOLCHAIN": "1",
504 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 496 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
505 }, 497 },
506 "name": "Second build", 498 "name": "Second build",
507 "~followup_annotations": [ 499 "~followup_annotations": [
508 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", 500 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
509 "@@@STEP_LOG_END@json.output (invalid)@@@" 501 "@@@STEP_LOG_END@json.output (invalid)@@@"
510 ] 502 ]
511 }, 503 },
512 { 504 {
513 "cmd": [ 505 "cmd": [
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 ], 580 ],
589 "cwd": "[SLAVE_BUILD]", 581 "cwd": "[SLAVE_BUILD]",
590 "name": "compare_build_artifacts" 582 "name": "compare_build_artifacts"
591 }, 583 },
592 { 584 {
593 "name": "$result", 585 "name": "$result",
594 "recipe_result": null, 586 "recipe_result": null,
595 "status_code": 0 587 "status_code": 0
596 } 588 }
597 ] 589 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698