Bump recipe deps to include swarming revert.
R=martiniss@chromium.org
Change-Id: I21677ceccc4f41b00ec06330d4bde9d75d8ba06c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2218456
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Auto-Submit: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index f3e1208..67118b2 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -21,7 +21,7 @@
},
"recipe_engine": {
"branch": "refs/heads/master",
- "revision": "4af7811ff97185909adb1a058be892162eaeca92",
+ "revision": "923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
diff --git a/scripts/slave/README.recipes.md b/scripts/slave/README.recipes.md
index 0980223..ec13509 100644
--- a/scripts/slave/README.recipes.md
+++ b/scripts/slave/README.recipes.md
@@ -5633,31 +5633,31 @@
[depot_tools/recipe_modules/presubmit]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/42033b2c6a25dda81bdce4547ea61a29abab79a0/recipes/README.recipes.md#recipe_modules-presubmit
[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/42033b2c6a25dda81bdce4547ea61a29abab79a0/recipes/README.recipes.md#recipe_modules-tryserver
[depot_tools/recipe_modules/windows_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/42033b2c6a25dda81bdce4547ea61a29abab79a0/recipes/README.recipes.md#recipe_modules-windows_sdk
-[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-assertions
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-commit_position
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-cq
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/generator_script]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-generator_script
-[recipe_engine/recipe_modules/isolated]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-isolated
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-led
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-resultdb
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/scheduler]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-scheduler
-[recipe_engine/recipe_modules/service_account]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-service_account
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/swarming]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-swarming
-[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-time
-[recipe_engine/recipe_modules/tricium]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-tricium
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-url
-[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/README.recipes.md#recipe_modules-version
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/recipe_engine/recipe_api.py#871
-[recipe_engine/wkt/returns_placeholder]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/4af7811ff97185909adb1a058be892162eaeca92/recipe_engine/util.py#140
+[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-assertions
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-commit_position
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-cq
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/generator_script]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-generator_script
+[recipe_engine/recipe_modules/isolated]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-isolated
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-led
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-resultdb
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/scheduler]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-scheduler
+[recipe_engine/recipe_modules/service_account]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-service_account
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/swarming]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-swarming
+[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-time
+[recipe_engine/recipe_modules/tricium]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-tricium
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-url
+[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/README.recipes.md#recipe_modules-version
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/recipe_engine/recipe_api.py#871
+[recipe_engine/wkt/returns_placeholder]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/923fb4bfa6f6930bac2ba3f03162ce8c59e0eb93/recipe_engine/util.py#140
diff --git a/scripts/slave/recipes/openscreen.expected/linux_arm64_debug.json b/scripts/slave/recipes/openscreen.expected/linux_arm64_debug.json
index 45e6bdb..2923b20 100644
--- a/scripts/slave/recipes/openscreen.expected/linux_arm64_debug.json
+++ b/scripts/slave/recipes/openscreen.expected/linux_arm64_debug.json
@@ -495,14 +495,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": "[START_DIR]/openscreen",
+ "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",
@@ -512,7 +531,7 @@
],
"cwd": "[START_DIR]/openscreen",
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -530,7 +549,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_BOT_DIED.json b/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_BOT_DIED.json
index 8494f5c..fd1ab07 100644
--- a/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_BOT_DIED.json
+++ b/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_BOT_DIED.json
@@ -495,14 +495,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": "[START_DIR]/openscreen",
+ "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",
@@ -512,7 +531,7 @@
],
"cwd": "[START_DIR]/openscreen",
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -530,7 +549,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_COMPLETED_and_failed.json b/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_COMPLETED_and_failed.json
index b60126d..f9eb3fb 100644
--- a/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_COMPLETED_and_failed.json
+++ b/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_COMPLETED_and_failed.json
@@ -495,14 +495,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": "[START_DIR]/openscreen",
+ "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",
@@ -512,7 +531,7 @@
],
"cwd": "[START_DIR]/openscreen",
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -530,7 +549,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
diff --git a/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_TIMED_OUT.json b/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_TIMED_OUT.json
index 9c98e79..5fc1403 100644
--- a/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_TIMED_OUT.json
+++ b/scripts/slave/recipes/openscreen.expected/linux_arm64_debug_with_collect_TIMED_OUT.json
@@ -495,14 +495,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": "[START_DIR]/openscreen",
+ "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",
@@ -512,7 +531,7 @@
],
"cwd": "[START_DIR]/openscreen",
"infra_step": true,
- "name": "ensure isolated.ensure_installed",
+ "name": "install isolated.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -530,7 +549,7 @@
},
{
"cmd": [
- "[CACHE]/isolated_client/isolated",
+ "[CACHE]/cipd/infra/tools/luci/isolated/isolated_module_pin/isolated",
"archive",
"-verbose",
"-isolate-server",
