Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.
Please review the expectation changes, and LGTM+CQ.
recipe_engine:
https://chromium.googlesource.com/infra/luci/recipes-py/+/fd22f03f112f57d043d43c06de423bf1f3215b2a
fd22f03 (tikuta@chromium.org)
cas: simplify _version a bit
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
R=mohrr@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ie2049eaf000851f537f1e98ea8db80559dfb98e9
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/51042
Commit-Queue: Recipe Deps Roller <recipe-deps-roller@pigweed.google.com.iam.gserviceaccount.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
Reviewed-by: Rob Mohr <mohrr@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 4d69401..010f97e 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -19,12 +19,12 @@
"deps": {
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "f10967578c67d94470596ad5a130004a6bfe8f25",
+ "revision": "ae4215058fcf8816898bf2ae8389b98777a647f1",
"url": "https://fuchsia.googlesource.com/infra/recipes"
},
"recipe_engine": {
"branch": "refs/heads/main",
- "revision": "fe59faf05ee40c253aed7864cf238a23fbe2b0e4",
+ "revision": "fd22f03f112f57d043d43c06de423bf1f3215b2a",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py"
}
},
diff --git a/recipe_modules/build/tests/full.expected/full.json b/recipe_modules/build/tests/full.expected/full.json
index 052704d..fe9ad74 100644
--- a/recipe_modules/build/tests/full.expected/full.json
+++ b/recipe_modules/build/tests/full.expected/full.json
@@ -62,7 +62,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CACHE]/cipd/infra/tools/luci/cas/cas_module_pin"
+ "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
],
"infra_step": true,
"name": "archive to cas.install infra/tools/luci/cas.ensure package directory",
@@ -75,9 +75,9 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/cipd/infra/tools/luci/cas/cas_module_pin",
+ "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
"-ensure-file",
- "infra/tools/luci/cas/${platform} cas_module_pin",
+ "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
"-max-threads",
"0",
"-json-output",
@@ -91,7 +91,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-cas_module_pin--\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:moc\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/cas/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -102,7 +102,7 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/tools/luci/cas/cas_module_pin/cas",
+ "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
"archive",
"-cas-instance",
"projects/example-cas-server/instances/default_instance",
@@ -120,7 +120,7 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/tools/luci/cas/cas_module_pin/cas",
+ "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
"download",
"-cas-instance",
"projects/example-cas-server/instances/default_instance",
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index 163ee0b..879b4b8 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -635,7 +635,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CACHE]/cipd/infra/tools/luci/cas/cas_module_pin"
+ "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
],
"env": {
"BUILDBUCKET_ID": "8945511751514863184",
@@ -658,9 +658,9 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/cipd/infra/tools/luci/cas/cas_module_pin",
+ "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
"-ensure-file",
- "infra/tools/luci/cas/${platform} cas_module_pin",
+ "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
"-max-threads",
"0",
"-json-output",
@@ -684,7 +684,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-cas_module_pin--\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:moc\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/cas/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -695,7 +695,7 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/tools/luci/cas/cas_module_pin/cas",
+ "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
"archive",
"-cas-instance",
"projects/example-cas-server/instances/default_instance",
