Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (fuchsia) into this repository.
The build that created this CL was
https://ci.chromium.org/b/8828485282430211553
Please review the expectation changes, and LGTM+CQ.
fuchsia:
https://fuchsia.googlesource.com/infra/recipes/+/7d081e4bae1f6c35fe0823051880b22ec7c18313
7d081e4 (yuanzhi@google.com)
[cipd_utils] Update to use create_from_pkg
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
R=mohrr@google.com, tpudlik@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I3894b8e2be58e8c67b1d2f5fb2f025bc063e84f0
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/72640
Reviewed-by: Rob Mohr <mohrr@google.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 397084d..49a4201 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -21,7 +21,7 @@
"deps": {
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "94d6dcd48fd9b4629bca498b3c76947292cba939",
+ "revision": "7d081e4bae1f6c35fe0823051880b22ec7c18313",
"url": "https://fuchsia.googlesource.com/infra/recipes"
},
"recipe_engine": {
diff --git a/recipe_modules/cipd_upload/tests/full.expected/extra_tags.json b/recipe_modules/cipd_upload/tests/full.expected/extra_tags.json
index a8f2ada..301cb12 100644
--- a/recipe_modules/cipd_upload/tests/full.expected/extra_tags.json
+++ b/recipe_modules/cipd_upload/tests/full.expected/extra_tags.json
@@ -11,31 +11,6 @@
{
"cmd": [
"cipd",
- "pkg-build",
- "-pkg-def",
- "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/baz.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"foo/bar/baz/linux-amd64\", \"root\": \"[START_DIR]/pkgroot\"}",
- "-out",
- "[CLEANUP]/baz.cipd",
- "-hash-algo",
- "sha256",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "cipd.build foo/bar/baz/linux-amd64",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"foo/bar/baz/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
"search",
"foo/bar/baz/linux-amd64",
"-tag",
@@ -55,8 +30,11 @@
{
"cmd": [
"cipd",
- "pkg-register",
- "[CLEANUP]/baz.cipd",
+ "create",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/baz.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"foo/bar/baz/linux-amd64\", \"root\": \"[START_DIR]/pkgroot\"}",
+ "-hash-algo",
+ "sha256",
"-ref",
"latest",
"-tag",
@@ -72,7 +50,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd.register foo/bar/baz/linux-amd64",
+ "name": "cipd.create foo/bar/baz/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -82,7 +60,7 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LINK@foo/bar/baz/linux-amd64@https://chrome-infra-packages.appspot.com/p/foo/bar/baz/linux-amd64/+/40-chars-fake-of-the-package-instance_id@@@"
+ "@@@STEP_LINK@40-chars-fake-of-the-package-instance_id@https://chrome-infra-packages.appspot.com/p/foo/bar/baz/linux-amd64/+/40-chars-fake-of-the-package-instance_id@@@"
]
},
{
diff --git a/recipe_modules/cipd_upload/tests/full.expected/found.json b/recipe_modules/cipd_upload/tests/full.expected/found.json
index 45bcb64..6420b06 100644
--- a/recipe_modules/cipd_upload/tests/full.expected/found.json
+++ b/recipe_modules/cipd_upload/tests/full.expected/found.json
@@ -6,31 +6,6 @@
{
"cmd": [
"cipd",
- "pkg-build",
- "-pkg-def",
- "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/baz.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"foo/bar/baz/linux-amd64\", \"root\": \"[START_DIR]/pkgroot\"}",
- "-out",
- "[CLEANUP]/baz.cipd",
- "-hash-algo",
- "sha256",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "cipd.build foo/bar/baz/linux-amd64",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"foo/bar/baz/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
"search",
"foo/bar/baz/linux-amd64",
"-tag",
diff --git a/recipe_modules/cipd_upload/tests/full.expected/upload.json b/recipe_modules/cipd_upload/tests/full.expected/upload.json
index a8f2ada..301cb12 100644
--- a/recipe_modules/cipd_upload/tests/full.expected/upload.json
+++ b/recipe_modules/cipd_upload/tests/full.expected/upload.json
@@ -11,31 +11,6 @@
{
"cmd": [
"cipd",
- "pkg-build",
- "-pkg-def",
- "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/baz.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"foo/bar/baz/linux-amd64\", \"root\": \"[START_DIR]/pkgroot\"}",
- "-out",
- "[CLEANUP]/baz.cipd",
- "-hash-algo",
- "sha256",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "cipd.build foo/bar/baz/linux-amd64",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"foo/bar/baz/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
"search",
"foo/bar/baz/linux-amd64",
"-tag",
@@ -55,8 +30,11 @@
{
"cmd": [
"cipd",
- "pkg-register",
- "[CLEANUP]/baz.cipd",
+ "create",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/baz.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"foo/bar/baz/linux-amd64\", \"root\": \"[START_DIR]/pkgroot\"}",
+ "-hash-algo",
+ "sha256",
"-ref",
"latest",
"-tag",
@@ -72,7 +50,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd.register foo/bar/baz/linux-amd64",
+ "name": "cipd.create foo/bar/baz/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -82,7 +60,7 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LINK@foo/bar/baz/linux-amd64@https://chrome-infra-packages.appspot.com/p/foo/bar/baz/linux-amd64/+/40-chars-fake-of-the-package-instance_id@@@"
+ "@@@STEP_LINK@40-chars-fake-of-the-package-instance_id@https://chrome-infra-packages.appspot.com/p/foo/bar/baz/linux-amd64/+/40-chars-fake-of-the-package-instance_id@@@"
]
},
{
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index 81daa77..2727d68 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -943,31 +943,6 @@
{
"cmd": [
"cipd",
- "pkg-build",
- "-pkg-def",
- "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/path.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"pigweed/cipd/path\", \"root\": \"[START_DIR]/cipd-package\"}",
- "-out",
- "[CLEANUP]/path.cipd",
- "-hash-algo",
- "sha256",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "cipd.build pigweed/cipd/path",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"pigweed/cipd/path\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
"search",
"pigweed/cipd/path",
"-tag",
@@ -987,8 +962,11 @@
{
"cmd": [
"cipd",
- "pkg-register",
- "[CLEANUP]/path.cipd",
+ "create",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/path.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"pigweed/cipd/path\", \"root\": \"[START_DIR]/cipd-package\"}",
+ "-hash-algo",
+ "sha256",
"-ref",
"latest",
"-tag",
@@ -1000,7 +978,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd.register pigweed/cipd/path",
+ "name": "cipd.create pigweed/cipd/path",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1010,7 +988,7 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LINK@pigweed/cipd/path@https://chrome-infra-packages.appspot.com/p/pigweed/cipd/path/+/40-chars-fake-of-the-package-instance_id@@@"
+ "@@@STEP_LINK@40-chars-fake-of-the-package-instance_id@https://chrome-infra-packages.appspot.com/p/pigweed/cipd/path/+/40-chars-fake-of-the-package-instance_id@@@"
]
},
{
diff --git a/recipes/target_to_cipd.expected/success.json b/recipes/target_to_cipd.expected/success.json
index 7bdf127..c5e0bd8 100644
--- a/recipes/target_to_cipd.expected/success.json
+++ b/recipes/target_to_cipd.expected/success.json
@@ -1262,43 +1262,6 @@
{
"cmd": [
"cipd",
- "pkg-build",
- "-pkg-def",
- "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/path.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"pigweed/cipd/path\", \"root\": \"[START_DIR]/cipd-package\"}",
- "-out",
- "[CLEANUP]/path.cipd",
- "-hash-algo",
- "sha256",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "cipd.build pigweed/cipd/path",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"pigweed/cipd/path\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
"search",
"pigweed/cipd/path",
"-tag",
@@ -1330,8 +1293,11 @@
{
"cmd": [
"cipd",
- "pkg-register",
- "[CLEANUP]/path.cipd",
+ "create",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/path.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"pigweed/cipd/path\", \"root\": \"[START_DIR]/cipd-package\"}",
+ "-hash-algo",
+ "sha256",
"-ref",
"latest",
"-tag",
@@ -1355,7 +1321,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd.register pigweed/cipd/path",
+ "name": "cipd.create pigweed/cipd/path",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1365,7 +1331,7 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LINK@pigweed/cipd/path@https://chrome-infra-packages.appspot.com/p/pigweed/cipd/path/+/40-chars-fake-of-the-package-instance_id@@@"
+ "@@@STEP_LINK@40-chars-fake-of-the-package-instance_id@https://chrome-infra-packages.appspot.com/p/pigweed/cipd/path/+/40-chars-fake-of-the-package-instance_id@@@"
]
},
{
