Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (fuchsia) into this repository.
Please review the expectation changes, and LGTM+CQ.
fuchsia:
https://crrev.com/c5236b910b5d93abedfc7b5ecac0e8efb3cfa8a2 (haowei@google.com)
[gcloud] Invoke gcloud python script directly
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
R=chillers@google.com, fujino@google.com, godofredoc@google.com, keyonghan@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I9701cb98918e5f3388ab18aadda64765fd81a054
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/11160
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 5e110c3..009e3a5 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -45,7 +45,7 @@
},
"fuchsia": {
"branch": "refs/heads/master",
- "revision": "8a762566f2a611b4ea394610b702f8129900a0d8",
+ "revision": "c5236b910b5d93abedfc7b5ecac0e8efb3cfa8a2",
"url": "https://fuchsia.googlesource.com/infra/recipes.git"
},
"infra": {
diff --git a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
index 08c75e7..ac9cf38 100644
--- a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
@@ -19976,14 +19976,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19998,9 +19991,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -20017,9 +20010,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -20035,40 +20028,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/clobber.json b/recipes/engine.expected/clobber.json
index 3ffda69..33f9220 100644
--- a/recipes/engine.expected/clobber.json
+++ b/recipes/engine.expected/clobber.json
@@ -15071,14 +15071,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15093,9 +15086,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15112,9 +15105,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15130,40 +15123,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/experimental.json b/recipes/engine.expected/experimental.json
index ef1daf9..e392428 100644
--- a/recipes/engine.expected/experimental.json
+++ b/recipes/engine.expected/experimental.json
@@ -15061,14 +15061,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15083,9 +15076,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15102,9 +15095,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15120,40 +15113,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index e5ba768..44cbc0b 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -19175,14 +19175,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19197,9 +19190,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19216,9 +19209,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19234,40 +19227,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/first_bot_update_failed.json b/recipes/engine.expected/first_bot_update_failed.json
index e1eafea..818ac9e 100644
--- a/recipes/engine.expected/first_bot_update_failed.json
+++ b/recipes/engine.expected/first_bot_update_failed.json
@@ -15234,14 +15234,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15256,9 +15249,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15275,9 +15268,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15293,40 +15286,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/gcloud_pubsub_failure.json b/recipes/engine.expected/gcloud_pubsub_failure.json
index b83fe5b..e90ecde 100644
--- a/recipes/engine.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine.expected/gcloud_pubsub_failure.json
@@ -15071,14 +15071,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15093,9 +15086,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15112,9 +15105,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15130,40 +15123,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux.json b/recipes/engine.expected/linux.json
index 99a4bf2..574a0c0 100644
--- a/recipes/engine.expected/linux.json
+++ b/recipes/engine.expected/linux.json
@@ -15061,14 +15061,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15083,9 +15076,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15102,9 +15095,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15120,40 +15113,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_maven_or_bitcode.json b/recipes/engine.expected/linux_maven_or_bitcode.json
index 99a4bf2..574a0c0 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode.json
@@ -15061,14 +15061,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15083,9 +15076,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15102,9 +15095,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15120,40 +15113,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
index dbe90c7..f111a8e 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
@@ -15076,14 +15076,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15098,9 +15091,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15117,9 +15110,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15135,40 +15128,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
index 99a4bf2..574a0c0 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -15061,14 +15061,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15083,9 +15076,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15102,9 +15095,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15120,40 +15113,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
index dbe90c7..f111a8e 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
@@ -15076,14 +15076,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15098,9 +15091,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15117,9 +15110,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15135,40 +15128,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_no_lto.json b/recipes/engine.expected/linux_no_lto.json
index dbe90c7..f111a8e 100644
--- a/recipes/engine.expected/linux_no_lto.json
+++ b/recipes/engine.expected/linux_no_lto.json
@@ -15076,14 +15076,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15098,9 +15091,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15117,9 +15110,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15135,40 +15128,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_publish_cipd.json b/recipes/engine.expected/linux_publish_cipd.json
index 99a4bf2..574a0c0 100644
--- a/recipes/engine.expected/linux_publish_cipd.json
+++ b/recipes/engine.expected/linux_publish_cipd.json
@@ -15061,14 +15061,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15083,9 +15076,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15102,9 +15095,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15120,40 +15113,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_publish_cipd_no_lto.json b/recipes/engine.expected/linux_publish_cipd_no_lto.json
index dbe90c7..f111a8e 100644
--- a/recipes/engine.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_publish_cipd_no_lto.json
@@ -15076,14 +15076,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15098,9 +15091,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15117,9 +15110,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15135,40 +15128,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index e8e1c2a..5eac844 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -19323,14 +19323,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19345,9 +19338,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19364,9 +19357,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19382,40 +19375,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode.json b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
index 2ad39d5..1f8d2b2 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
@@ -18279,14 +18279,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18301,9 +18294,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18320,9 +18313,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18338,40 +18331,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
index 72a65bc..8e5b19b 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -18294,14 +18294,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18316,9 +18309,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18335,9 +18328,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18353,40 +18346,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index 93de092..f3a4d7f 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -18917,14 +18917,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18939,9 +18932,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18958,9 +18951,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18976,40 +18969,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index d4494d7..b02ef1e 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -18932,14 +18932,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18954,9 +18947,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18973,9 +18966,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18991,40 +18984,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_upload_no_lto.json b/recipes/engine.expected/linux_upload_no_lto.json
index 078bc6b..ca78e6b 100644
--- a/recipes/engine.expected/linux_upload_no_lto.json
+++ b/recipes/engine.expected/linux_upload_no_lto.json
@@ -19338,14 +19338,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19360,9 +19353,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19379,9 +19372,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19397,40 +19390,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_upload_publish_cipd.json b/recipes/engine.expected/linux_upload_publish_cipd.json
index 4885d10..db3ce4f 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd.json
@@ -19961,14 +19961,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19983,9 +19976,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -20002,9 +19995,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -20020,40 +20013,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
index 8b402bc..4084f84 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
@@ -19976,14 +19976,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19998,9 +19991,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -20017,9 +20010,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -20035,40 +20028,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac.json b/recipes/engine.expected/mac.json
index ca2412f..31ab0bc 100644
--- a/recipes/engine.expected/mac.json
+++ b/recipes/engine.expected/mac.json
@@ -9859,14 +9859,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9881,9 +9874,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9900,9 +9893,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9918,40 +9911,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_maven_or_bitcode.json b/recipes/engine.expected/mac_maven_or_bitcode.json
index 9cdfe2d..34f5065 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode.json
@@ -11525,14 +11525,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11547,9 +11540,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11566,9 +11559,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11584,40 +11577,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
index 0102403..f75cc80 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
@@ -11539,14 +11539,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11561,9 +11554,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11580,9 +11573,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11598,40 +11591,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
index 9cdfe2d..34f5065 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -11525,14 +11525,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11547,9 +11540,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11566,9 +11559,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11584,40 +11577,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 0102403..f75cc80 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -11539,14 +11539,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11561,9 +11554,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11580,9 +11573,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11598,40 +11591,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_no_lto.json b/recipes/engine.expected/mac_no_lto.json
index 71097a3..26774eb 100644
--- a/recipes/engine.expected/mac_no_lto.json
+++ b/recipes/engine.expected/mac_no_lto.json
@@ -9873,14 +9873,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9895,9 +9888,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9914,9 +9907,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9932,40 +9925,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_publish_cipd.json b/recipes/engine.expected/mac_publish_cipd.json
index ca2412f..31ab0bc 100644
--- a/recipes/engine.expected/mac_publish_cipd.json
+++ b/recipes/engine.expected/mac_publish_cipd.json
@@ -9859,14 +9859,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9881,9 +9874,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9900,9 +9893,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9918,40 +9911,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_publish_cipd_no_lto.json b/recipes/engine.expected/mac_publish_cipd_no_lto.json
index 71097a3..26774eb 100644
--- a/recipes/engine.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_publish_cipd_no_lto.json
@@ -9873,14 +9873,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9895,9 +9888,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9914,9 +9907,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9932,40 +9925,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_upload.json b/recipes/engine.expected/mac_upload.json
index 65b818a..083d994 100644
--- a/recipes/engine.expected/mac_upload.json
+++ b/recipes/engine.expected/mac_upload.json
@@ -11763,14 +11763,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11785,9 +11778,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11804,9 +11797,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11822,40 +11815,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode.json b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
index 64dc4f0..873d86f 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
@@ -13277,14 +13277,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13299,9 +13292,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13318,9 +13311,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13336,40 +13329,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
index a72019c..bf798ee 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -13291,14 +13291,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13313,9 +13306,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13332,9 +13325,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13350,40 +13343,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 64dc4f0..873d86f 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -13277,14 +13277,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13299,9 +13292,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13318,9 +13311,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13336,40 +13329,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index a72019c..bf798ee 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -13291,14 +13291,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13313,9 +13306,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13332,9 +13325,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13350,40 +13343,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_upload_no_lto.json b/recipes/engine.expected/mac_upload_no_lto.json
index cda0d9b..a7aeb6e 100644
--- a/recipes/engine.expected/mac_upload_no_lto.json
+++ b/recipes/engine.expected/mac_upload_no_lto.json
@@ -11777,14 +11777,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11799,9 +11792,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11818,9 +11811,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11836,40 +11829,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_upload_publish_cipd.json b/recipes/engine.expected/mac_upload_publish_cipd.json
index 65b818a..083d994 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd.json
@@ -11763,14 +11763,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11785,9 +11778,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11804,9 +11797,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11822,40 +11815,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
index cda0d9b..a7aeb6e 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
@@ -11777,14 +11777,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11799,9 +11792,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11818,9 +11811,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11836,40 +11829,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/pull_request.json b/recipes/engine.expected/pull_request.json
index 3ffda69..33f9220 100644
--- a/recipes/engine.expected/pull_request.json
+++ b/recipes/engine.expected/pull_request.json
@@ -15071,14 +15071,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15093,9 +15086,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15112,9 +15105,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15130,40 +15123,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win.json b/recipes/engine.expected/win.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine.expected/win.json
+++ b/recipes/engine.expected/win.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_maven_or_bitcode.json b/recipes/engine.expected/win_maven_or_bitcode.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine.expected/win_maven_or_bitcode.json
+++ b/recipes/engine.expected/win_maven_or_bitcode.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_maven_or_bitcode_no_lto.json b/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_no_lto.json b/recipes/engine.expected/win_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine.expected/win_no_lto.json
+++ b/recipes/engine.expected/win_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_publish_cipd.json b/recipes/engine.expected/win_publish_cipd.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine.expected/win_publish_cipd.json
+++ b/recipes/engine.expected/win_publish_cipd.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_publish_cipd_no_lto.json b/recipes/engine.expected/win_publish_cipd_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_publish_cipd_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_upload.json b/recipes/engine.expected/win_upload.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine.expected/win_upload.json
+++ b/recipes/engine.expected/win_upload.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode.json b/recipes/engine.expected/win_upload_maven_or_bitcode.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_upload_no_lto.json b/recipes/engine.expected/win_upload_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine.expected/win_upload_no_lto.json
+++ b/recipes/engine.expected/win_upload_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_upload_publish_cipd.json b/recipes/engine.expected/win_upload_publish_cipd.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine.expected/win_upload_publish_cipd.json
+++ b/recipes/engine.expected/win_upload_publish_cipd.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm.expected/clobber.json b/recipes/engine/engine_arm.expected/clobber.json
index e12c486..73a6e4a 100644
--- a/recipes/engine/engine_arm.expected/clobber.json
+++ b/recipes/engine/engine_arm.expected/clobber.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm.expected/experimental.json b/recipes/engine/engine_arm.expected/experimental.json
index dc3a070..0cf51d7 100644
--- a/recipes/engine/engine_arm.expected/experimental.json
+++ b/recipes/engine/engine_arm.expected/experimental.json
@@ -1912,14 +1912,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1934,9 +1927,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1953,9 +1946,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1971,40 +1964,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm.expected/experimental_upload.json b/recipes/engine/engine_arm.expected/experimental_upload.json
index f8e20f2..bcf1a32 100644
--- a/recipes/engine/engine_arm.expected/experimental_upload.json
+++ b/recipes/engine/engine_arm.expected/experimental_upload.json
@@ -2346,14 +2346,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -2368,9 +2361,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -2387,9 +2380,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -2405,40 +2398,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json b/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
index 86bbd23..6eac9c6 100644
--- a/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm.expected/linux.json b/recipes/engine/engine_arm.expected/linux.json
index da1a747..a3629de 100644
--- a/recipes/engine/engine_arm.expected/linux.json
+++ b/recipes/engine/engine_arm.expected/linux.json
@@ -1912,14 +1912,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1934,9 +1927,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1953,9 +1946,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1971,40 +1964,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm.expected/linux_upload.json b/recipes/engine/engine_arm.expected/linux_upload.json
index 3e1c40b..312c5d7 100644
--- a/recipes/engine/engine_arm.expected/linux_upload.json
+++ b/recipes/engine/engine_arm.expected/linux_upload.json
@@ -2346,14 +2346,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -2368,9 +2361,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -2387,9 +2380,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -2405,40 +2398,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm.expected/pull_request.json b/recipes/engine/engine_arm.expected/pull_request.json
index e12c486..73a6e4a 100644
--- a/recipes/engine/engine_arm.expected/pull_request.json
+++ b/recipes/engine/engine_arm.expected/pull_request.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_26_0.expected/clobber.json b/recipes/engine/engine_arm_1_26_0.expected/clobber.json
index e12c486..73a6e4a 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/clobber.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/clobber.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_26_0.expected/experimental.json b/recipes/engine/engine_arm_1_26_0.expected/experimental.json
index dc3a070..0cf51d7 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/experimental.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/experimental.json
@@ -1912,14 +1912,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1934,9 +1927,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1953,9 +1946,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1971,40 +1964,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_26_0.expected/experimental_upload.json b/recipes/engine/engine_arm_1_26_0.expected/experimental_upload.json
index f8e20f2..bcf1a32 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/experimental_upload.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/experimental_upload.json
@@ -2346,14 +2346,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -2368,9 +2361,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -2387,9 +2380,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -2405,40 +2398,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_26_0.expected/gcloud_pubsub_failure.json b/recipes/engine/engine_arm_1_26_0.expected/gcloud_pubsub_failure.json
index 86bbd23..6eac9c6 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/gcloud_pubsub_failure.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_26_0.expected/linux.json b/recipes/engine/engine_arm_1_26_0.expected/linux.json
index da1a747..a3629de 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/linux.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/linux.json
@@ -1912,14 +1912,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1934,9 +1927,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1953,9 +1946,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1971,40 +1964,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_26_0.expected/linux_upload.json b/recipes/engine/engine_arm_1_26_0.expected/linux_upload.json
index 3e1c40b..312c5d7 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/linux_upload.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/linux_upload.json
@@ -2346,14 +2346,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -2368,9 +2361,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -2387,9 +2380,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -2405,40 +2398,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_26_0.expected/pull_request.json b/recipes/engine/engine_arm_1_26_0.expected/pull_request.json
index e12c486..73a6e4a 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/pull_request.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/pull_request.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_27_0.expected/clobber.json b/recipes/engine/engine_arm_1_27_0.expected/clobber.json
index e12c486..73a6e4a 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/clobber.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/clobber.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_27_0.expected/experimental.json b/recipes/engine/engine_arm_1_27_0.expected/experimental.json
index dc3a070..0cf51d7 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/experimental.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/experimental.json
@@ -1912,14 +1912,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1934,9 +1927,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1953,9 +1946,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1971,40 +1964,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_27_0.expected/experimental_upload.json b/recipes/engine/engine_arm_1_27_0.expected/experimental_upload.json
index f8e20f2..bcf1a32 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/experimental_upload.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/experimental_upload.json
@@ -2346,14 +2346,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -2368,9 +2361,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -2387,9 +2380,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -2405,40 +2398,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_27_0.expected/gcloud_pubsub_failure.json b/recipes/engine/engine_arm_1_27_0.expected/gcloud_pubsub_failure.json
index 86bbd23..6eac9c6 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/gcloud_pubsub_failure.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_27_0.expected/linux.json b/recipes/engine/engine_arm_1_27_0.expected/linux.json
index da1a747..a3629de 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/linux.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/linux.json
@@ -1912,14 +1912,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1934,9 +1927,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1953,9 +1946,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1971,40 +1964,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_27_0.expected/linux_upload.json b/recipes/engine/engine_arm_1_27_0.expected/linux_upload.json
index 3e1c40b..312c5d7 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/linux_upload.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/linux_upload.json
@@ -2346,14 +2346,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -2368,9 +2361,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -2387,9 +2380,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -2405,40 +2398,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine/engine_arm_1_27_0.expected/pull_request.json b/recipes/engine/engine_arm_1_27_0.expected/pull_request.json
index e12c486..73a6e4a 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/pull_request.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/pull_request.json
@@ -1914,14 +1914,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -1936,9 +1929,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1955,9 +1948,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -1973,40 +1966,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine_1_26_0.expected/Linux Fuchsia skips on duplicate.json
index 203df23..8076ea7 100644
--- a/recipes/engine_1_26_0.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine_1_26_0.expected/Linux Fuchsia skips on duplicate.json
@@ -19910,14 +19910,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19932,9 +19925,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19951,9 +19944,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19969,40 +19962,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/clobber.json b/recipes/engine_1_26_0.expected/clobber.json
index 15c1574..848eae1 100644
--- a/recipes/engine_1_26_0.expected/clobber.json
+++ b/recipes/engine_1_26_0.expected/clobber.json
@@ -15005,14 +15005,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15027,9 +15020,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15046,9 +15039,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15064,40 +15057,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/experimental.json b/recipes/engine_1_26_0.expected/experimental.json
index e08b53f..af59af3 100644
--- a/recipes/engine_1_26_0.expected/experimental.json
+++ b/recipes/engine_1_26_0.expected/experimental.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/experimental_upload.json b/recipes/engine_1_26_0.expected/experimental_upload.json
index a87df98..dfcd4bf 100644
--- a/recipes/engine_1_26_0.expected/experimental_upload.json
+++ b/recipes/engine_1_26_0.expected/experimental_upload.json
@@ -19109,14 +19109,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19131,9 +19124,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19150,9 +19143,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19168,40 +19161,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/first_bot_update_failed.json b/recipes/engine_1_26_0.expected/first_bot_update_failed.json
index 1dea71f..b78c47f 100644
--- a/recipes/engine_1_26_0.expected/first_bot_update_failed.json
+++ b/recipes/engine_1_26_0.expected/first_bot_update_failed.json
@@ -15168,14 +15168,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15190,9 +15183,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15209,9 +15202,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15227,40 +15220,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/gcloud_pubsub_failure.json b/recipes/engine_1_26_0.expected/gcloud_pubsub_failure.json
index 7e13362..49032e0 100644
--- a/recipes/engine_1_26_0.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine_1_26_0.expected/gcloud_pubsub_failure.json
@@ -15005,14 +15005,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15027,9 +15020,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15046,9 +15039,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15064,40 +15057,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux.json b/recipes/engine_1_26_0.expected/linux.json
index aefadf8..5c72a02 100644
--- a/recipes/engine_1_26_0.expected/linux.json
+++ b/recipes/engine_1_26_0.expected/linux.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode.json
index aefadf8..5c72a02 100644
--- a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_no_lto.json
index 6565763..3e16645 100644
--- a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_no_lto.json
@@ -15010,14 +15010,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15032,9 +15025,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15051,9 +15044,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15069,40 +15062,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd.json
index aefadf8..5c72a02 100644
--- a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
index 6565763..3e16645 100644
--- a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
@@ -15010,14 +15010,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15032,9 +15025,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15051,9 +15044,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15069,40 +15062,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_no_lto.json b/recipes/engine_1_26_0.expected/linux_no_lto.json
index 6565763..3e16645 100644
--- a/recipes/engine_1_26_0.expected/linux_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_no_lto.json
@@ -15010,14 +15010,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15032,9 +15025,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15051,9 +15044,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15069,40 +15062,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_publish_cipd.json b/recipes/engine_1_26_0.expected/linux_publish_cipd.json
index aefadf8..5c72a02 100644
--- a/recipes/engine_1_26_0.expected/linux_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/linux_publish_cipd.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/linux_publish_cipd_no_lto.json
index 6565763..3e16645 100644
--- a/recipes/engine_1_26_0.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_publish_cipd_no_lto.json
@@ -15010,14 +15010,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15032,9 +15025,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15051,9 +15044,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15069,40 +15062,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_upload.json b/recipes/engine_1_26_0.expected/linux_upload.json
index c232451..c9de6b9 100644
--- a/recipes/engine_1_26_0.expected/linux_upload.json
+++ b/recipes/engine_1_26_0.expected/linux_upload.json
@@ -19257,14 +19257,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19279,9 +19272,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19298,9 +19291,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19316,40 +19309,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode.json
index a48dd0f..9d0a84f 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode.json
@@ -18213,14 +18213,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18235,9 +18228,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18254,9 +18247,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18272,40 +18265,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_no_lto.json
index 5ca0949..03c41cc 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -18228,14 +18228,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18250,9 +18243,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18269,9 +18262,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18287,40 +18280,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index 674eb2d..95c91e2 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -18851,14 +18851,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18873,9 +18866,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18892,9 +18885,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18910,40 +18903,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 83e255c..f6adf38 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -18866,14 +18866,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18888,9 +18881,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18907,9 +18900,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18925,40 +18918,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_upload_no_lto.json b/recipes/engine_1_26_0.expected/linux_upload_no_lto.json
index 5c6a2b2..3e0710c 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_no_lto.json
@@ -19272,14 +19272,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19294,9 +19287,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19313,9 +19306,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19331,40 +19324,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_upload_publish_cipd.json b/recipes/engine_1_26_0.expected/linux_upload_publish_cipd.json
index fbd3b8a..c153fac 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_publish_cipd.json
@@ -19895,14 +19895,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19917,9 +19910,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19936,9 +19929,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19954,40 +19947,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/linux_upload_publish_cipd_no_lto.json
index 6d362d3..1464441 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_publish_cipd_no_lto.json
@@ -19910,14 +19910,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19932,9 +19925,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19951,9 +19944,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19969,40 +19962,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac.json b/recipes/engine_1_26_0.expected/mac.json
index ca2412f..31ab0bc 100644
--- a/recipes/engine_1_26_0.expected/mac.json
+++ b/recipes/engine_1_26_0.expected/mac.json
@@ -9859,14 +9859,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9881,9 +9874,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9900,9 +9893,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9918,40 +9911,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
index 9cdfe2d..34f5065 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
@@ -11525,14 +11525,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11547,9 +11540,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11566,9 +11559,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11584,40 +11577,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
index 0102403..f75cc80 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
@@ -11539,14 +11539,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11561,9 +11554,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11580,9 +11573,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11598,40 +11591,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
index 9cdfe2d..34f5065 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -11525,14 +11525,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11547,9 +11540,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11566,9 +11559,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11584,40 +11577,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 0102403..f75cc80 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -11539,14 +11539,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11561,9 +11554,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11580,9 +11573,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11598,40 +11591,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_no_lto.json b/recipes/engine_1_26_0.expected/mac_no_lto.json
index 71097a3..26774eb 100644
--- a/recipes/engine_1_26_0.expected/mac_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_no_lto.json
@@ -9873,14 +9873,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9895,9 +9888,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9914,9 +9907,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9932,40 +9925,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_publish_cipd.json
index ca2412f..31ab0bc 100644
--- a/recipes/engine_1_26_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_publish_cipd.json
@@ -9859,14 +9859,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9881,9 +9874,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9900,9 +9893,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9918,40 +9911,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
index 71097a3..26774eb 100644
--- a/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
@@ -9873,14 +9873,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9895,9 +9888,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9914,9 +9907,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9932,40 +9925,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_upload.json b/recipes/engine_1_26_0.expected/mac_upload.json
index 65b818a..083d994 100644
--- a/recipes/engine_1_26_0.expected/mac_upload.json
+++ b/recipes/engine_1_26_0.expected/mac_upload.json
@@ -11763,14 +11763,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11785,9 +11778,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11804,9 +11797,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11822,40 +11815,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
index 64dc4f0..873d86f 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
@@ -13277,14 +13277,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13299,9 +13292,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13318,9 +13311,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13336,40 +13329,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
index a72019c..bf798ee 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -13291,14 +13291,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13313,9 +13306,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13332,9 +13325,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13350,40 +13343,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 64dc4f0..873d86f 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -13277,14 +13277,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13299,9 +13292,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13318,9 +13311,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13336,40 +13329,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index a72019c..bf798ee 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -13291,14 +13291,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13313,9 +13306,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13332,9 +13325,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13350,40 +13343,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_upload_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
index cda0d9b..a7aeb6e 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
@@ -11777,14 +11777,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11799,9 +11792,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11818,9 +11811,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11836,40 +11829,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
index 65b818a..083d994 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
@@ -11763,14 +11763,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11785,9 +11778,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11804,9 +11797,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11822,40 +11815,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
index cda0d9b..a7aeb6e 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
@@ -11777,14 +11777,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11799,9 +11792,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11818,9 +11811,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11836,40 +11829,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/pull_request.json b/recipes/engine_1_26_0.expected/pull_request.json
index 15c1574..848eae1 100644
--- a/recipes/engine_1_26_0.expected/pull_request.json
+++ b/recipes/engine_1_26_0.expected/pull_request.json
@@ -15005,14 +15005,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15027,9 +15020,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15046,9 +15039,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15064,40 +15057,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win.json b/recipes/engine_1_26_0.expected/win.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine_1_26_0.expected/win.json
+++ b/recipes/engine_1_26_0.expected/win.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/win_maven_or_bitcode.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine_1_26_0.expected/win_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/win_maven_or_bitcode.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_no_lto.json b/recipes/engine_1_26_0.expected/win_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine_1_26_0.expected/win_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_publish_cipd.json b/recipes/engine_1_26_0.expected/win_publish_cipd.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine_1_26_0.expected/win_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/win_publish_cipd.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/win_publish_cipd_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine_1_26_0.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_publish_cipd_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_upload.json b/recipes/engine_1_26_0.expected/win_upload.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine_1_26_0.expected/win_upload.json
+++ b/recipes/engine_1_26_0.expected/win_upload.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_upload_no_lto.json b/recipes/engine_1_26_0.expected/win_upload_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine_1_26_0.expected/win_upload_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_upload_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_upload_publish_cipd.json b/recipes/engine_1_26_0.expected/win_upload_publish_cipd.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine_1_26_0.expected/win_upload_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/win_upload_publish_cipd.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_26_0.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/win_upload_publish_cipd_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine_1_26_0.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_upload_publish_cipd_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine_1_27_0.expected/Linux Fuchsia skips on duplicate.json
index 6b72207..4ec6369 100644
--- a/recipes/engine_1_27_0.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine_1_27_0.expected/Linux Fuchsia skips on duplicate.json
@@ -19910,14 +19910,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19932,9 +19925,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19951,9 +19944,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19969,40 +19962,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/clobber.json b/recipes/engine_1_27_0.expected/clobber.json
index 15c1574..848eae1 100644
--- a/recipes/engine_1_27_0.expected/clobber.json
+++ b/recipes/engine_1_27_0.expected/clobber.json
@@ -15005,14 +15005,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15027,9 +15020,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15046,9 +15039,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15064,40 +15057,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/experimental.json b/recipes/engine_1_27_0.expected/experimental.json
index e08b53f..af59af3 100644
--- a/recipes/engine_1_27_0.expected/experimental.json
+++ b/recipes/engine_1_27_0.expected/experimental.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/experimental_upload.json b/recipes/engine_1_27_0.expected/experimental_upload.json
index 86379f1..9330573 100644
--- a/recipes/engine_1_27_0.expected/experimental_upload.json
+++ b/recipes/engine_1_27_0.expected/experimental_upload.json
@@ -19109,14 +19109,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19131,9 +19124,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19150,9 +19143,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19168,40 +19161,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/first_bot_update_failed.json b/recipes/engine_1_27_0.expected/first_bot_update_failed.json
index 1dea71f..b78c47f 100644
--- a/recipes/engine_1_27_0.expected/first_bot_update_failed.json
+++ b/recipes/engine_1_27_0.expected/first_bot_update_failed.json
@@ -15168,14 +15168,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15190,9 +15183,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15209,9 +15202,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15227,40 +15220,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/gcloud_pubsub_failure.json b/recipes/engine_1_27_0.expected/gcloud_pubsub_failure.json
index 7e13362..49032e0 100644
--- a/recipes/engine_1_27_0.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine_1_27_0.expected/gcloud_pubsub_failure.json
@@ -15005,14 +15005,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15027,9 +15020,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15046,9 +15039,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15064,40 +15057,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux.json b/recipes/engine_1_27_0.expected/linux.json
index aefadf8..5c72a02 100644
--- a/recipes/engine_1_27_0.expected/linux.json
+++ b/recipes/engine_1_27_0.expected/linux.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode.json
index aefadf8..5c72a02 100644
--- a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_no_lto.json
index 6565763..3e16645 100644
--- a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_no_lto.json
@@ -15010,14 +15010,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15032,9 +15025,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15051,9 +15044,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15069,40 +15062,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd.json
index aefadf8..5c72a02 100644
--- a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
index 6565763..3e16645 100644
--- a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
@@ -15010,14 +15010,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15032,9 +15025,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15051,9 +15044,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15069,40 +15062,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_no_lto.json b/recipes/engine_1_27_0.expected/linux_no_lto.json
index 6565763..3e16645 100644
--- a/recipes/engine_1_27_0.expected/linux_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_no_lto.json
@@ -15010,14 +15010,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15032,9 +15025,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15051,9 +15044,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15069,40 +15062,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_publish_cipd.json b/recipes/engine_1_27_0.expected/linux_publish_cipd.json
index aefadf8..5c72a02 100644
--- a/recipes/engine_1_27_0.expected/linux_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/linux_publish_cipd.json
@@ -14995,14 +14995,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15017,9 +15010,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15036,9 +15029,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15054,40 +15047,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/linux_publish_cipd_no_lto.json
index 6565763..3e16645 100644
--- a/recipes/engine_1_27_0.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_publish_cipd_no_lto.json
@@ -15010,14 +15010,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15032,9 +15025,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15051,9 +15044,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15069,40 +15062,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_upload.json b/recipes/engine_1_27_0.expected/linux_upload.json
index 2253492..cf351e0 100644
--- a/recipes/engine_1_27_0.expected/linux_upload.json
+++ b/recipes/engine_1_27_0.expected/linux_upload.json
@@ -19257,14 +19257,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19279,9 +19272,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19298,9 +19291,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19316,40 +19309,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode.json
index bc41aa5..3329a89 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode.json
@@ -18213,14 +18213,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18235,9 +18228,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18254,9 +18247,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18272,40 +18265,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_no_lto.json
index 2d3feb0..7a2dc61 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -18228,14 +18228,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18250,9 +18243,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18269,9 +18262,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18287,40 +18280,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index 12704eb..f91660a 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -18851,14 +18851,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18873,9 +18866,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18892,9 +18885,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18910,40 +18903,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 57808a9..c5fdcbc 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -18866,14 +18866,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -18888,9 +18881,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -18907,9 +18900,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -18925,40 +18918,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_upload_no_lto.json b/recipes/engine_1_27_0.expected/linux_upload_no_lto.json
index 7d3de58..7b5de0c 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_no_lto.json
@@ -19272,14 +19272,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19294,9 +19287,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19313,9 +19306,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19331,40 +19324,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_upload_publish_cipd.json b/recipes/engine_1_27_0.expected/linux_upload_publish_cipd.json
index 7aad597..814d42c 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_publish_cipd.json
@@ -19895,14 +19895,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19917,9 +19910,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19936,9 +19929,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19954,40 +19947,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/linux_upload_publish_cipd_no_lto.json
index 5dc7409..5212cb0 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_publish_cipd_no_lto.json
@@ -19910,14 +19910,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -19932,9 +19925,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -19951,9 +19944,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -19969,40 +19962,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac.json b/recipes/engine_1_27_0.expected/mac.json
index ca2412f..31ab0bc 100644
--- a/recipes/engine_1_27_0.expected/mac.json
+++ b/recipes/engine_1_27_0.expected/mac.json
@@ -9859,14 +9859,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9881,9 +9874,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9900,9 +9893,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9918,40 +9911,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
index 9cdfe2d..34f5065 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
@@ -11525,14 +11525,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11547,9 +11540,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11566,9 +11559,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11584,40 +11577,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
index 0102403..f75cc80 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
@@ -11539,14 +11539,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11561,9 +11554,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11580,9 +11573,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11598,40 +11591,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
index 9cdfe2d..34f5065 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -11525,14 +11525,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11547,9 +11540,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11566,9 +11559,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11584,40 +11577,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 0102403..f75cc80 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -11539,14 +11539,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11561,9 +11554,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11580,9 +11573,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11598,40 +11591,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_no_lto.json b/recipes/engine_1_27_0.expected/mac_no_lto.json
index 71097a3..26774eb 100644
--- a/recipes/engine_1_27_0.expected/mac_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_no_lto.json
@@ -9873,14 +9873,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9895,9 +9888,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9914,9 +9907,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9932,40 +9925,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_publish_cipd.json
index ca2412f..31ab0bc 100644
--- a/recipes/engine_1_27_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_publish_cipd.json
@@ -9859,14 +9859,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9881,9 +9874,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9900,9 +9893,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9918,40 +9911,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
index 71097a3..26774eb 100644
--- a/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
@@ -9873,14 +9873,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -9895,9 +9888,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -9914,9 +9907,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -9932,40 +9925,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_upload.json b/recipes/engine_1_27_0.expected/mac_upload.json
index 65b818a..083d994 100644
--- a/recipes/engine_1_27_0.expected/mac_upload.json
+++ b/recipes/engine_1_27_0.expected/mac_upload.json
@@ -11763,14 +11763,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11785,9 +11778,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11804,9 +11797,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11822,40 +11815,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
index 64dc4f0..873d86f 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
@@ -13277,14 +13277,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13299,9 +13292,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13318,9 +13311,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13336,40 +13329,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
index a72019c..bf798ee 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -13291,14 +13291,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13313,9 +13306,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13332,9 +13325,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13350,40 +13343,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 64dc4f0..873d86f 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -13277,14 +13277,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13299,9 +13292,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13318,9 +13311,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13336,40 +13329,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index a72019c..bf798ee 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -13291,14 +13291,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -13313,9 +13306,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -13332,9 +13325,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -13350,40 +13343,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_upload_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
index cda0d9b..a7aeb6e 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
@@ -11777,14 +11777,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11799,9 +11792,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11818,9 +11811,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11836,40 +11829,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
index 65b818a..083d994 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
@@ -11763,14 +11763,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11785,9 +11778,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11804,9 +11797,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11822,40 +11815,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
index cda0d9b..a7aeb6e 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
@@ -11777,14 +11777,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -11799,9 +11792,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -11818,9 +11811,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -11836,40 +11829,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/pull_request.json b/recipes/engine_1_27_0.expected/pull_request.json
index 15c1574..848eae1 100644
--- a/recipes/engine_1_27_0.expected/pull_request.json
+++ b/recipes/engine_1_27_0.expected/pull_request.json
@@ -15005,14 +15005,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -15027,9 +15020,9 @@
"[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -15046,9 +15039,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -15064,40 +15057,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win.json b/recipes/engine_1_27_0.expected/win.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine_1_27_0.expected/win.json
+++ b/recipes/engine_1_27_0.expected/win.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/win_maven_or_bitcode.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine_1_27_0.expected/win_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/win_maven_or_bitcode.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_no_lto.json b/recipes/engine_1_27_0.expected/win_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine_1_27_0.expected/win_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_publish_cipd.json b/recipes/engine_1_27_0.expected/win_publish_cipd.json
index c05dad1..f2c5c60 100644
--- a/recipes/engine_1_27_0.expected/win_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/win_publish_cipd.json
@@ -5264,14 +5264,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5286,9 +5279,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5305,9 +5298,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5323,40 +5316,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/win_publish_cipd_no_lto.json
index 8534e92..6191550 100644
--- a/recipes/engine_1_27_0.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_publish_cipd_no_lto.json
@@ -5271,14 +5271,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -5293,9 +5286,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -5312,9 +5305,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -5330,40 +5323,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_upload.json b/recipes/engine_1_27_0.expected/win_upload.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine_1_27_0.expected/win_upload.json
+++ b/recipes/engine_1_27_0.expected/win_upload.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_upload_no_lto.json b/recipes/engine_1_27_0.expected/win_upload_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine_1_27_0.expected/win_upload_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_upload_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_upload_publish_cipd.json b/recipes/engine_1_27_0.expected/win_upload_publish_cipd.json
index 8ee0794..c4c5e00 100644
--- a/recipes/engine_1_27_0.expected/win_upload_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/win_upload_publish_cipd.json
@@ -6416,14 +6416,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6438,9 +6431,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6457,9 +6450,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6475,40 +6468,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/engine_1_27_0.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/win_upload_publish_cipd_no_lto.json
index 675fefd..08629cf 100644
--- a/recipes/engine_1_27_0.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_upload_publish_cipd_no_lto.json
@@ -6423,14 +6423,7 @@
},
{
"cmd": [],
- "name": "ensure gcloud"
- },
- {
- "cmd": [],
- "name": "ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/gcloud"
},
{
"cmd": [
@@ -6445,9 +6438,9 @@
"[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -6464,9 +6457,9 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -6482,40 +6475,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]\\resources\\gcloud",
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud"
- ],
- "infra_step": true,
- "name": "ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\bin\\gcloud",
+ "[CACHE]\\cipd\\infra\\gcloud\\version%3A266.0.0.chromium0\\lib\\gcloud.py",
"pubsub",
"topics",
"publish",
diff --git a/recipes/firebaselab/firebaselab.expected/basic.json b/recipes/firebaselab/firebaselab.expected/basic.json
index ae73a74..39e298a 100644
--- a/recipes/firebaselab/firebaselab.expected/basic.json
+++ b/recipes/firebaselab/firebaselab.expected/basic.json
@@ -168,19 +168,12 @@
},
{
"cmd": [],
- "name": "test_execution.ensure gcloud",
+ "name": "test_execution.install infra/gcloud",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
- "cmd": [],
- "name": "test_execution.ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
"cmd": [
"vpython",
"-u",
@@ -209,9 +202,9 @@
]
},
"infra_step": true,
- "name": "test_execution.ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "test_execution.install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
@@ -244,9 +237,9 @@
]
},
"infra_step": true,
- "name": "test_execution.ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "test_execution.install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -262,72 +255,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
- "env": {
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "test_execution.ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
- "env": {
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "test_execution.ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"--quiet",
"config",
"set",
@@ -386,7 +316,9 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "python",
+ "-u",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"firebase",
"test",
"android",
@@ -459,7 +391,9 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "python",
+ "-u",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"firebase",
"test",
"android",
diff --git a/recipes/firebaselab/firebaselab_1_20_0.expected/basic.json b/recipes/firebaselab/firebaselab_1_20_0.expected/basic.json
index bb3f936..edbdecb 100644
--- a/recipes/firebaselab/firebaselab_1_20_0.expected/basic.json
+++ b/recipes/firebaselab/firebaselab_1_20_0.expected/basic.json
@@ -197,19 +197,12 @@
},
{
"cmd": [],
- "name": "test_execution.ensure gcloud",
+ "name": "test_execution.install infra/gcloud",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
- "cmd": [],
- "name": "test_execution.ensure gcloud.install infra/gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
"cmd": [
"vpython",
"-u",
@@ -238,9 +231,9 @@
]
},
"infra_step": true,
- "name": "test_execution.ensure gcloud.install infra/gcloud.ensure package directory",
+ "name": "test_execution.install infra/gcloud.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
@@ -273,9 +266,9 @@
]
},
"infra_step": true,
- "name": "test_execution.ensure gcloud.install infra/gcloud.ensure_installed",
+ "name": "test_execution.install infra/gcloud.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -291,72 +284,9 @@
},
{
"cmd": [
- "vpython",
+ "python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
- "env": {
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "test_execution.ensure gcloud.remove gcloud wrapper",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gcloud]/resources/gcloud",
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud"
- ],
- "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
- "env": {
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "test_execution.ensure gcloud.copy patched gcloud",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"--quiet",
"config",
"set",
@@ -386,7 +316,9 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/bin/gcloud",
+ "python",
+ "-u",
+ "[CACHE]/cipd/infra/gcloud/version%3A266.0.0.chromium0/lib/gcloud.py",
"firebase",
"test",
"android",
