| Index: scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/linux_sdk_multi.json
|
| diff --git a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/linux_sdk_multi.json b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/linux_sdk_multi.json
|
| index c621babbc451fa23d7e26551d4ed31b43d7b5d94..481b9c902fbe06cd393d1da5e8a5a12f7f07ce1b 100644
|
| --- a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/linux_sdk_multi.json
|
| +++ b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/linux_sdk_multi.json
|
| @@ -74,6 +74,64 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [],
|
| + "name": "ensure_goma"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[depot_tools::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/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_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-goma_recipe_modu\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@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",
|
| @@ -119,7 +177,7 @@
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| - "[BUILD]/goma",
|
| + "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]/src",
|
|
|