Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (build, depot_tools, fuchsia, recipe_engine) into this repository.
Please review the expectation changes, and LGTM+CQ.
build:
https://crrev.com/4431e722ea74b7d3ffc5b2bc5de84951eef69b9e (gbeaty@chromium.org)
Remove the gclient_config_kwargs field from BotSpec.
https://crrev.com/735568ebad950c3444ddf89bd3aa05a37bdc2cf5 (rwkeane@google.com)
Openscreen: Fix unexpected Behavior
https://crrev.com/5fb43d7ade7f067245b6ee69ce87d21f86690408 (yyanagisawa@chromium.org)
Always execute api.goma.stop when Goma is used.
https://crrev.com/b6d7ad279f349ab3d48a3dfa735590c81516d6e9 (iannucci@chromium.org)
Remove usage of buildbot-oriented builder_cache path.
https://crrev.com/e02c1530dbe10da3fab94a0d8fb52c9b2d62813b (bpastene@chromium.org)
Add mb_luci_auth to all chromium.android testers.
https://crrev.com/980b62dc07df56b3009e45ff52a79ec82a07f4bf (rwkeane@google.com)
Openscreen: Fix intermittent coverage failures
https://crrev.com/a67eb27aad07a5c8e8e00ce912d37bab214773f2 (agable@chromium.org)
Remove agable from build OWNERS
https://crrev.com/23a3c39ab2cacb2d449699c117a07e80b2c86e45 (iannucci@chromium.org)
Bump recipe deps to include swarming revert.
https://crrev.com/486b578a852ac7e64136a019c9eb8d8ab6be1452 (iannucci@chromium.org)
Remove use of deprecated infra_paths module.
depot_tools:
https://crrev.com/603989e2c0d69d5a04e3496bb9c2af6c83a1234a (andreas@apap04.com)
add clarification for Python 3
https://crrev.com/2be61a1df411ae154bc440052b396e62cbf4ea36 (scheib@chromium.org)
Document the parameter {heading} avilable to --output-format-heading.
https://crrev.com/0ec48260a2c2650b35cd5fdd80aa0454401b60d4 (vadimsh@chromium.org)
[luci-auth] Update to the latest version.
https://crrev.com/f203902ee8b7002b1853c1a7144b60d98f6dd06f (iannucci@chromium.org)
[lucicfg] Update to 1.14.3.
https://crrev.com/0c7d654c747414f2765bb93771567c64cb26b881 (iannucci@chromium.org)
[bb] Update bb tool to contain latest protos.
https://crrev.com/cdaf0be1f4ceb802bfc62f4ed86825aa17395dc4 (zhin@chromium.org)
Add git completion helper to cl upload
https://crrev.com/6e7ddb698ba00641bd5672b0e646cbe098b5498b (agable@chromium.org)
Remove agable from depot_tools OWNERS and TODOs
fuchsia:
https://crrev.com/068c17b9b3e2318ca181ac9615dfac860cd7319f (olivernewman@google.com)
[gsutil] Use ensure_tool() to install gsutil
https://crrev.com/366eda2fcefcccd9480acdb134802c1c10363688 (olivernewman@google.com)
[lkgs] Use ensure_tool() to install lkgs
https://crrev.com/6b824fd94c90fe1f0d328d7bf2e199e662de069d (mseaborn@google.com)
[testing] Remove unused legacy_qemu and device_type arguments
https://crrev.com/3e3f4a0a99e6206f493f8fd487b01956a688819b (mseaborn@google.com)
[testing] Refactor: Merge deprecated_test() and test_in_shards() into one
https://crrev.com/eb5d8c2d39eb653b5f469623b7f59dbc0eef3234 (ihuh@google.com)
[testing_requests][zbi_test] Add env vars to the swarming tasks.
https://crrev.com/904b6ed6520aab6d3ca135020b8716e65c78d7ee (nmulcahey@google.com)
[jiri] Roll jiri to 1791a60e022
https://crrev.com/4b1d69a5abb642231c37af51b745b0be5d9e9a7b (mohrr@google.com)
[sso] Add support for "insteadof"
https://crrev.com/3a9ed3fe28cf7f166f9e731ebcaced66e36a4e41 (mohrr@google.com)
[sso] Allow hyphens in hostnames
https://crrev.com/e89f9efaa8b2495700d0c9d68114b8284671b511 (garymm@google.com)
Remove failure string checks from testing module
https://crrev.com/a63ae9f61665db3c353054375a4b913ec21e465f (atyfto@google.com)
[fxt] Support -json-output flag
https://crrev.com/7e067a47f4648914bbf2314c8f0dd69e2bfb769f (atyfto@google.com)
[fxt] Add support for `cleanup` command
https://crrev.com/24ef2e42d0ad514b340584969924fbcc5b554cba (mohrr@google.com)
[recipe_testing][commit_queue] Enable use of private tryjobs
https://crrev.com/0cc3189bd6fe31f66eeceb9364fb25ef54bf7dae (phosek@google.com)
[windows_sdk] Introduce Windows SDK module
https://crrev.com/4d42dc9212dcb360073df560c05c4c9db164334d (mohrr@google.com)
[commit_queue] Make authenticated HTTP request
https://crrev.com/99dfaf9e568d5302448c126266f93316e173d8d1 (olivernewman@google.com)
[checkout] Show git log for tryjobs
recipe_engine:
https://crrev.com/bf5c53d04c84487f31275133294f5a57145fecf4 (olivernewman@google.com)
[swarming] Use ensure_tool() to install swarming
https://crrev.com/9ddf1e1c6ae354ee17de8abd99dc37acdf4dbe60 (olivernewman@google.com)
[isolated] Use ensure_tool() to install isolated
https://crrev.com/567bbd0e945b1144e2343441deac92a661a17f9d (yiwzhang@google.com)
[proto_module] Remove unused DEPS
https://crrev.com/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93 (olivernewman@google.com)
Revert "[swarming] Use ensure_tool() to install swarming"
https://crrev.com/b2839ad3882c5f1412afbd31f72c45355e404932 (olivernewman@google.com)
[cipd] URL-encode version in tool path
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
R=godofredoc@google.com, keyonghan@google.com, wutong@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I5421667a54b1a4217ee4af169ef2032a22b94c47
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/3120
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index e47567e..054969f 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -22,22 +22,22 @@
"deps": {
"build": {
"branch": "refs/heads/master",
- "revision": "03b25bad088e6aa56502fb55f04971560ac1c9ac",
+ "revision": "74dd78c16b28a80b85d9a3dc90aad158e9abb8bf",
"url": "https://chromium.googlesource.com/chromium/tools/build"
},
"depot_tools": {
"branch": "refs/heads/master",
- "revision": "42033b2c6a25dda81bdce4547ea61a29abab79a0",
+ "revision": "6e7ddb698ba00641bd5672b0e646cbe098b5498b",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"fuchsia": {
"branch": "refs/heads/master",
- "revision": "8036e010594aeb96546b7fea350395c5dc84dae9",
+ "revision": "3462696aba2995cf87b4a4701aecb3b8affcd6d6",
"url": "https://fuchsia.googlesource.com/infra/recipes.git"
},
"recipe_engine": {
"branch": "refs/heads/master",
- "revision": "4af7811ff97185909adb1a058be892162eaeca92",
+ "revision": "b2839ad3882c5f1412afbd31f72c45355e404932",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
diff --git a/recipe_modules/fuchsia_util/examples/full.expected/basic.json b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
index f3b594a..7e334a0 100644
--- a/recipe_modules/fuchsia_util/examples/full.expected/basic.json
+++ b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
@@ -175,17 +175,35 @@
},
{
"cmd": [],
- "name": "Fuchsia Tests.Create Isolate Archive.ensure isolated",
+ "name": "Fuchsia Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "infra_step": true,
+ "name": "Fuchsia Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -194,7 +212,7 @@
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "Fuchsia Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Fuchsia Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -212,7 +230,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/clobber.json b/recipes/engine.expected/clobber.json
index 023fab0..dd42410 100644
--- a/recipes/engine.expected/clobber.json
+++ b/recipes/engine.expected/clobber.json
@@ -14017,14 +14017,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -14048,7 +14081,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -14066,7 +14099,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14872,7 +14905,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/experimental.json b/recipes/engine.expected/experimental.json
index e6c1ed3..653d765 100644
--- a/recipes/engine.expected/experimental.json
+++ b/recipes/engine.expected/experimental.json
@@ -13960,14 +13960,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -13991,7 +14024,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -14009,7 +14042,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14815,7 +14848,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index 5d853a2..e025cc4 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -16443,14 +16443,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -16474,7 +16507,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -16492,7 +16525,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -17298,7 +17331,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/linux.json b/recipes/engine.expected/linux.json
index 49ad476..c0abc75 100644
--- a/recipes/engine.expected/linux.json
+++ b/recipes/engine.expected/linux.json
@@ -13933,14 +13933,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -13964,7 +13997,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13982,7 +14015,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14787,7 +14820,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/linux_maven_or_bitcode.json b/recipes/engine.expected/linux_maven_or_bitcode.json
index 49ad476..c0abc75 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode.json
@@ -13933,14 +13933,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -13964,7 +13997,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13982,7 +14015,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14787,7 +14820,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index 266bd34..dabcf3b 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -16416,14 +16416,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -16447,7 +16480,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -16465,7 +16498,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -17270,7 +17303,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode.json b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
index d7f54e5..2388f0e 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
@@ -15459,14 +15459,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -15490,7 +15523,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -15508,7 +15541,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -16313,7 +16346,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/mac.json b/recipes/engine.expected/mac.json
index f993540..1210933 100644
--- a/recipes/engine.expected/mac.json
+++ b/recipes/engine.expected/mac.json
@@ -9349,14 +9349,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -9380,7 +9413,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -9398,7 +9431,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/mac_maven_or_bitcode.json b/recipes/engine.expected/mac_maven_or_bitcode.json
index 469f508..218bd3d 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode.json
@@ -11248,14 +11248,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -11279,7 +11312,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -11297,7 +11330,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/mac_upload.json b/recipes/engine.expected/mac_upload.json
index ab9bb52..c66c538 100644
--- a/recipes/engine.expected/mac_upload.json
+++ b/recipes/engine.expected/mac_upload.json
@@ -10122,14 +10122,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -10153,7 +10186,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -10171,7 +10204,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode.json b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
index d59a4aa..7731982 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
@@ -11951,14 +11951,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -11982,7 +12015,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -12000,7 +12033,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine.expected/pull_request.json b/recipes/engine.expected/pull_request.json
index f74ffc9..1f71b33 100644
--- a/recipes/engine.expected/pull_request.json
+++ b/recipes/engine.expected/pull_request.json
@@ -13970,14 +13970,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -14001,7 +14034,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -14019,7 +14052,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14825,7 +14858,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/Linux Fuchsia Infra Failure.json b/recipes/engine_1_18_0.expected/Linux Fuchsia Infra Failure.json
index 23e04c9..b3e6603 100644
--- a/recipes/engine_1_18_0.expected/Linux Fuchsia Infra Failure.json
+++ b/recipes/engine_1_18_0.expected/Linux Fuchsia Infra Failure.json
@@ -16246,14 +16246,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -16277,7 +16310,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -16295,7 +16328,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/clobber.json b/recipes/engine_1_18_0.expected/clobber.json
index 8237934..29c3839 100644
--- a/recipes/engine_1_18_0.expected/clobber.json
+++ b/recipes/engine_1_18_0.expected/clobber.json
@@ -13913,14 +13913,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -13944,7 +13977,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13962,7 +13995,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14759,7 +14792,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/experimental.json b/recipes/engine_1_18_0.expected/experimental.json
index 36be5bb..c3f3246 100644
--- a/recipes/engine_1_18_0.expected/experimental.json
+++ b/recipes/engine_1_18_0.expected/experimental.json
@@ -13856,14 +13856,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -13887,7 +13920,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13905,7 +13938,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14702,7 +14735,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/experimental_upload.json b/recipes/engine_1_18_0.expected/experimental_upload.json
index a89ae84..28acf4f 100644
--- a/recipes/engine_1_18_0.expected/experimental_upload.json
+++ b/recipes/engine_1_18_0.expected/experimental_upload.json
@@ -16273,14 +16273,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -16304,7 +16337,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -16322,7 +16355,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -17119,7 +17152,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/linux.json b/recipes/engine_1_18_0.expected/linux.json
index 463ebee..f059ec2 100644
--- a/recipes/engine_1_18_0.expected/linux.json
+++ b/recipes/engine_1_18_0.expected/linux.json
@@ -13829,14 +13829,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -13860,7 +13893,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13878,7 +13911,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14674,7 +14707,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/linux_maven_or_bitcode.json b/recipes/engine_1_18_0.expected/linux_maven_or_bitcode.json
index 463ebee..f059ec2 100644
--- a/recipes/engine_1_18_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_1_18_0.expected/linux_maven_or_bitcode.json
@@ -13829,14 +13829,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -13860,7 +13893,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13878,7 +13911,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14674,7 +14707,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/linux_upload.json b/recipes/engine_1_18_0.expected/linux_upload.json
index 167985d..f6d3665 100644
--- a/recipes/engine_1_18_0.expected/linux_upload.json
+++ b/recipes/engine_1_18_0.expected/linux_upload.json
@@ -16246,14 +16246,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -16277,7 +16310,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -16295,7 +16328,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -17091,7 +17124,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_1_18_0.expected/linux_upload_maven_or_bitcode.json
index 8e034f5..29cdfe7 100644
--- a/recipes/engine_1_18_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_18_0.expected/linux_upload_maven_or_bitcode.json
@@ -15289,14 +15289,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -15320,7 +15353,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -15338,7 +15371,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -16134,7 +16167,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/mac.json b/recipes/engine_1_18_0.expected/mac.json
index 9cf8bec..24a2283 100644
--- a/recipes/engine_1_18_0.expected/mac.json
+++ b/recipes/engine_1_18_0.expected/mac.json
@@ -9349,14 +9349,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -9380,7 +9413,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -9398,7 +9431,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_18_0.expected/mac_maven_or_bitcode.json
index 4299bc9..0d5ea47 100644
--- a/recipes/engine_1_18_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_18_0.expected/mac_maven_or_bitcode.json
@@ -11248,14 +11248,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -11279,7 +11312,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -11297,7 +11330,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/mac_upload.json b/recipes/engine_1_18_0.expected/mac_upload.json
index 9fad3d4..5240fb1 100644
--- a/recipes/engine_1_18_0.expected/mac_upload.json
+++ b/recipes/engine_1_18_0.expected/mac_upload.json
@@ -10122,14 +10122,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -10153,7 +10186,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -10171,7 +10204,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_18_0.expected/mac_upload_maven_or_bitcode.json
index fa3389f..1613e19 100644
--- a/recipes/engine_1_18_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_18_0.expected/mac_upload_maven_or_bitcode.json
@@ -11951,14 +11951,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -11982,7 +12015,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -12000,7 +12033,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_1_18_0.expected/pull_request.json b/recipes/engine_1_18_0.expected/pull_request.json
index b02c9d2..cd0cf4a 100644
--- a/recipes/engine_1_18_0.expected/pull_request.json
+++ b/recipes/engine_1_18_0.expected/pull_request.json
@@ -13866,14 +13866,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -13897,7 +13930,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13915,7 +13948,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14712,7 +14745,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json b/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
index eb42b6b..9e5faaf 100644
--- a/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
@@ -574,14 +574,33 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -591,7 +610,7 @@
],
"cwd": "[CACHE]/builder",
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -609,7 +628,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_builder_1_18_0.expected/Schedule two builds one with goma and one without.json b/recipes/engine_builder_1_18_0.expected/Schedule two builds one with goma and one without.json
index eb42b6b..9e5faaf 100644
--- a/recipes/engine_builder_1_18_0.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine_builder_1_18_0.expected/Schedule two builds one with goma and one without.json
@@ -574,14 +574,33 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -591,7 +610,7 @@
],
"cwd": "[CACHE]/builder",
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -609,7 +628,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_builder_v1_17_0.expected/Schedule two builds one with goma and one without.json b/recipes/engine_builder_v1_17_0.expected/Schedule two builds one with goma and one without.json
index eb42b6b..9e5faaf 100644
--- a/recipes/engine_builder_v1_17_0.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine_builder_v1_17_0.expected/Schedule two builds one with goma and one without.json
@@ -574,14 +574,33 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -591,7 +610,7 @@
],
"cwd": "[CACHE]/builder",
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -609,7 +628,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/clobber.json b/recipes/engine_v1_17_0.expected/clobber.json
index d146890..5272f13 100644
--- a/recipes/engine_v1_17_0.expected/clobber.json
+++ b/recipes/engine_v1_17_0.expected/clobber.json
@@ -13262,14 +13262,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -13293,7 +13326,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13311,7 +13344,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14085,7 +14118,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/experimental.json b/recipes/engine_v1_17_0.expected/experimental.json
index 86b604c..36b05d4 100644
--- a/recipes/engine_v1_17_0.expected/experimental.json
+++ b/recipes/engine_v1_17_0.expected/experimental.json
@@ -13205,14 +13205,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -13236,7 +13269,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13254,7 +13287,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14028,7 +14061,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/experimental_upload.json b/recipes/engine_v1_17_0.expected/experimental_upload.json
index a4916af..38959bc 100644
--- a/recipes/engine_v1_17_0.expected/experimental_upload.json
+++ b/recipes/engine_v1_17_0.expected/experimental_upload.json
@@ -15523,14 +15523,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -15554,7 +15587,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -15572,7 +15605,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -16346,7 +16379,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/linux.json b/recipes/engine_v1_17_0.expected/linux.json
index 86591e4..10796c1 100644
--- a/recipes/engine_v1_17_0.expected/linux.json
+++ b/recipes/engine_v1_17_0.expected/linux.json
@@ -13179,14 +13179,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -13210,7 +13243,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13228,7 +13261,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14001,7 +14034,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/linux_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/linux_maven_or_bitcode.json
index 86591e4..10796c1 100644
--- a/recipes/engine_v1_17_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/linux_maven_or_bitcode.json
@@ -13179,14 +13179,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -13210,7 +13243,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13228,7 +13261,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14001,7 +14034,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/linux_upload.json b/recipes/engine_v1_17_0.expected/linux_upload.json
index 7c2e331..046d247 100644
--- a/recipes/engine_v1_17_0.expected/linux_upload.json
+++ b/recipes/engine_v1_17_0.expected/linux_upload.json
@@ -15497,14 +15497,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -15528,7 +15561,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -15546,7 +15579,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -16319,7 +16352,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/linux_upload_maven_or_bitcode.json
index 11bf34d..6efab16 100644
--- a/recipes/engine_v1_17_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/linux_upload_maven_or_bitcode.json
@@ -14540,14 +14540,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -14571,7 +14604,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -14589,7 +14622,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -15362,7 +15395,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/mac.json b/recipes/engine_v1_17_0.expected/mac.json
index cb153a4..220e847 100644
--- a/recipes/engine_v1_17_0.expected/mac.json
+++ b/recipes/engine_v1_17_0.expected/mac.json
@@ -8960,14 +8960,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -8991,7 +9024,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -9009,7 +9042,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/mac_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/mac_maven_or_bitcode.json
index e5b09af..54efbc8 100644
--- a/recipes/engine_v1_17_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/mac_maven_or_bitcode.json
@@ -10859,14 +10859,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -10890,7 +10923,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -10908,7 +10941,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/mac_upload.json b/recipes/engine_v1_17_0.expected/mac_upload.json
index 8c884d5..7beaac7 100644
--- a/recipes/engine_v1_17_0.expected/mac_upload.json
+++ b/recipes/engine_v1_17_0.expected/mac_upload.json
@@ -9733,14 +9733,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -9764,7 +9797,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -9782,7 +9815,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/mac_upload_maven_or_bitcode.json
index e8e18d1..f7374a9 100644
--- a/recipes/engine_v1_17_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/mac_upload_maven_or_bitcode.json
@@ -11562,14 +11562,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -11593,7 +11626,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -11611,7 +11644,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/engine_v1_17_0.expected/pull_request.json b/recipes/engine_v1_17_0.expected/pull_request.json
index 07fb7e0..88657aa 100644
--- a/recipes/engine_v1_17_0.expected/pull_request.json
+++ b/recipes/engine_v1_17_0.expected/pull_request.json
@@ -13215,14 +13215,47 @@
},
{
"cmd": [],
- "name": "ensure isolated"
+ "name": "install isolated"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "name": "install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -13246,7 +13279,7 @@
]
},
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -13264,7 +13297,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
@@ -14038,7 +14071,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"download",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/Linux Fuchsia Infra Failure.json b/recipes/flutter_1_18_0.expected/Linux Fuchsia Infra Failure.json
index d507525..371ccbc 100644
--- a/recipes/flutter_1_18_0.expected/Linux Fuchsia Infra Failure.json
+++ b/recipes/flutter_1_18_0.expected/Linux Fuchsia Infra Failure.json
@@ -442,17 +442,47 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -473,7 +503,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -491,7 +521,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/linux_master.json b/recipes/flutter_1_18_0.expected/linux_master.json
index ff5a88f..bbadeb6 100644
--- a/recipes/flutter_1_18_0.expected/linux_master.json
+++ b/recipes/flutter_1_18_0.expected/linux_master.json
@@ -453,17 +453,48 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "GOLD_TRYJOB": "refs/heads/master",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -485,7 +516,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -503,7 +534,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/linux_master_coverage_.json b/recipes/flutter_1_18_0.expected/linux_master_coverage_.json
index 60bc1e9..24ea5ed 100644
--- a/recipes/flutter_1_18_0.expected/linux_master_coverage_.json
+++ b/recipes/flutter_1_18_0.expected/linux_master_coverage_.json
@@ -442,17 +442,47 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -473,7 +503,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -491,7 +521,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/linux_master_coverage__experimental.json b/recipes/flutter_1_18_0.expected/linux_master_coverage__experimental.json
index d5d01a5..849ec68 100644
--- a/recipes/flutter_1_18_0.expected/linux_master_coverage__experimental.json
+++ b/recipes/flutter_1_18_0.expected/linux_master_coverage__experimental.json
@@ -442,17 +442,47 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -473,7 +503,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -491,7 +521,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/linux_master_coverage__experimental_upload.json b/recipes/flutter_1_18_0.expected/linux_master_coverage__experimental_upload.json
index eb89c72..a5db9fa 100644
--- a/recipes/flutter_1_18_0.expected/linux_master_coverage__experimental_upload.json
+++ b/recipes/flutter_1_18_0.expected/linux_master_coverage__experimental_upload.json
@@ -442,17 +442,47 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -473,7 +503,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -491,7 +521,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/linux_master_coverage__upload.json b/recipes/flutter_1_18_0.expected/linux_master_coverage__upload.json
index 523354d..cc1441d 100644
--- a/recipes/flutter_1_18_0.expected/linux_master_coverage__upload.json
+++ b/recipes/flutter_1_18_0.expected/linux_master_coverage__upload.json
@@ -442,17 +442,47 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -473,7 +503,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -491,7 +521,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/linux_master_experimental.json b/recipes/flutter_1_18_0.expected/linux_master_experimental.json
index ef0bf04..937a141 100644
--- a/recipes/flutter_1_18_0.expected/linux_master_experimental.json
+++ b/recipes/flutter_1_18_0.expected/linux_master_experimental.json
@@ -453,17 +453,48 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "GOLD_TRYJOB": "refs/heads/master",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -485,7 +516,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -503,7 +534,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/linux_master_experimental_upload.json b/recipes/flutter_1_18_0.expected/linux_master_experimental_upload.json
index fdd0e5e..55f4cb3 100644
--- a/recipes/flutter_1_18_0.expected/linux_master_experimental_upload.json
+++ b/recipes/flutter_1_18_0.expected/linux_master_experimental_upload.json
@@ -442,17 +442,47 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -473,7 +503,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -491,7 +521,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/linux_master_upload.json b/recipes/flutter_1_18_0.expected/linux_master_upload.json
index 2273684..42019f8 100644
--- a/recipes/flutter_1_18_0.expected/linux_master_upload.json
+++ b/recipes/flutter_1_18_0.expected/linux_master_upload.json
@@ -442,17 +442,47 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -473,7 +503,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -491,7 +521,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/flutter_1_18_0.expected/pull_request.json b/recipes/flutter_1_18_0.expected/pull_request.json
index 69cdecb..b6d294d 100644
--- a/recipes/flutter_1_18_0.expected/pull_request.json
+++ b/recipes/flutter_1_18_0.expected/pull_request.json
@@ -453,17 +453,48 @@
},
{
"cmd": [],
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GOLDCTL": "[CACHE]/gold/goldctl",
+ "GOLD_TRYJOB": "refs/pull/1/head",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest",
"-ensure-file",
"infra/tools/luci/isolated/${platform} latest",
"-max-threads",
@@ -485,7 +516,7 @@
]
},
"infra_step": true,
- "name": "Run Fuchsia Driver Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Run Fuchsia Driver Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -503,7 +534,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/latest/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/fuchsia/fuchsia.expected/basic.json b/recipes/fuchsia/fuchsia.expected/basic.json
index e6b97b5..7bbc8b5 100644
--- a/recipes/fuchsia/fuchsia.expected/basic.json
+++ b/recipes/fuchsia/fuchsia.expected/basic.json
@@ -362,17 +362,46 @@
},
{
"cmd": [],
- "name": "Fuchsia Tests.Create Isolate Archive.ensure isolated",
+ "name": "Fuchsia Tests.Create Isolate Archive.install isolated",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin"
+ ],
+ "cwd": "[START_DIR]/flutter",
+ "env": {
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "PUB_CACHE": "[START_DIR]/flutter/.pub-cache"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter/bin",
+ "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "name": "Fuchsia Tests.Create Isolate Archive.install isolated.ensure package directory",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
+ "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/isolated_client",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin",
"-ensure-file",
"infra/tools/luci/isolated/${platform} isolated_module_pin",
"-max-threads",
@@ -392,7 +421,7 @@
]
},
"infra_step": true,
- "name": "Fuchsia Tests.Create Isolate Archive.ensure isolated.ensure_installed",
+ "name": "Fuchsia Tests.Create Isolate Archive.install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -410,7 +439,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/recipes/recipes.expected/ci.json b/recipes/recipes.expected/ci.json
index 1ee0d36..ed232f1 100644
--- a/recipes/recipes.expected/ci.json
+++ b/recipes/recipes.expected/ci.json
@@ -294,6 +294,19 @@
},
{
"cmd": [
+ "luci-auth",
+ "token",
+ "-lifetime",
+ "3m"
+ ],
+ "infra_step": true,
+ "name": "get commit-queue.get access token for default account",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
@@ -302,7 +315,9 @@
"--status-json",
"/path/to/tmp/json",
"--outfile",
- "/path/to/tmp/json"
+ "/path/to/tmp/json",
+ "--headers-json",
+ "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
],
"name": "get commit-queue.get",
"~followup_annotations": [
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index d89e55e..504b7c1 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -608,6 +608,19 @@
},
{
"cmd": [
+ "luci-auth",
+ "token",
+ "-lifetime",
+ "3m"
+ ],
+ "infra_step": true,
+ "name": "get commit-queue.get access token for default account",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
@@ -616,7 +629,9 @@
"--status-json",
"/path/to/tmp/json",
"--outfile",
- "/path/to/tmp/json"
+ "/path/to/tmp/json",
+ "--headers-json",
+ "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
],
"name": "get commit-queue.get",
"~followup_annotations": [
