Index: scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json |
diff --git a/scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json b/scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json |
index 93748ffed08ceb481346d2aaff9fdac9fae83be7..3e6c479cda9b1beb2842b87a212b72bb465a5d86 100644 |
--- a/scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json |
+++ b/scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json |
@@ -62,6 +62,60 @@ |
] |
}, |
{ |
+ "cmd": [], |
+ "name": "ensure_goma" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[build::cipd]/resources/bootstrap.py", |
+ "--platform", |
+ "linux-amd64", |
+ "--dest-directory", |
+ "[SLAVE_BUILD]/cipd", |
+ "--json-output", |
+ "/path/to/tmp/json" |
+ ], |
+ "name": "ensure_goma.install cipd", |
+ "~followup_annotations": [ |
+ "@@@STEP_NEST_LEVEL@1@@@", |
+ "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/cipd/cipd", |
+ "ensure", |
+ "--root", |
+ "[CACHE]/cipd/goma", |
+ "--list", |
+ "infra_internal/goma/client/linux-amd64 release", |
+ "--json-output", |
+ "/path/to/tmp/json", |
+ "--service-account-json", |
+ "/creds/service_accounts/service-account-goma-client.json" |
+ ], |
+ "name": "ensure_goma.ensure_installed", |
+ "~followup_annotations": [ |
+ "@@@STEP_NEST_LEVEL@1@@@", |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
+ "@@@STEP_LOG_LINE@json.output@ {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@ ]@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
"cmd": [ |
"python", |
"-u", |
@@ -72,7 +126,7 @@ |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_h264=1 target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' rtc_use_h264=1 target_arch=x64 use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -136,7 +190,7 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[CACHE]/cipd/goma", |
"--goma-fail-fast", |
"--goma-disable-local-fallback", |
"--", |