| Index: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json
|
| index 79bd8ce8fdf4754673017d9f22de6841964163e7..c467ba95828aa9fe00232ebaefb110e6e077ff69 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json
|
| @@ -49,6 +49,60 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [],
|
| + "name": "ensure_goma"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
|
| + "--platform",
|
| + "linux-386",
|
| + "--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-386 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-386\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| @@ -59,7 +113,7 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "OS=android clang=1 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=mipsel use_goma=1",
|
| + "GYP_DEFINES": "OS=android clang=1 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=mipsel use_goma=1",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -112,7 +166,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",
|
| "--"
|
|
|