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

Unified Diff: scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/mac_sdk_multi.json

Issue 2332213003: Add ensure_goma to NaCl SDK recipies (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/mac_sdk_multi.json
diff --git a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/mac_sdk_multi.json b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/mac_sdk_multi.json
index fe5b826a69928e7a780885619777e0f58f8cc5cc..85cb9585bf25c8e6e7c78fa14de58adf55941dfe 100644
--- a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/mac_sdk_multi.json
+++ b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/mac_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",
@@ -120,7 +178,7 @@
"--config-file",
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"--goma-dir",
- "[BUILD]/goma",
+ "[CACHE]/cipd/goma",
"//out/Release"
],
"cwd": "[SLAVE_BUILD]/src",

Powered by Google App Engine
This is Rietveld 408576698