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/8770015935801897761
Please review the expectation changes, and LGTM+CQ.
fuchsia:
https://fuchsia.googlesource.com/infra/recipes/+/b5b8e03731e27d596435b32085c93042cd8e3b1a
b5b8e03 (atyfto@google.com)
[cipd] Switch from tool manifests to cipd.ensure files
Please check the following references for more information:
- autoroller, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#autoroller
- rollback, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#rollback
- cross-repo dependencies, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/cross_repo.md
Use https://goo.gl/noib3a to file a bug.
R=mohrr@google.com, tpudlik@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Ignore-Freeze: Autoroller
Bugdroid-Send-Email: False
Change-Id: I535360d302030ab4dda7b4b8969ebfc38dadd467
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/170854
Reviewed-by: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 53c06c2..0abc5be 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -17,7 +17,7 @@
"deps": {
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "37cc36d1075ba4d028a0c6e6fc01b7c518e1b1aa",
+ "revision": "b5b8e03731e27d596435b32085c93042cd8e3b1a",
"url": "https://fuchsia.googlesource.com/infra/recipes"
},
"recipe_engine": {
diff --git a/recipe_modules/checkout/tests/git.expected/ci.json b/recipe_modules/checkout/tests/git.expected/ci.json
index 87bcf22..3a57002 100644
--- a/recipe_modules/checkout/tests/git.expected/ci.json
+++ b/recipe_modules/checkout/tests/git.expected/ci.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
index 9b0e17b..970b6ec 100644
--- a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
+++ b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/git.expected/other.json b/recipe_modules/checkout/tests/git.expected/other.json
index 414d8ac..2fd904c 100644
--- a/recipe_modules/checkout/tests/git.expected/other.json
+++ b/recipe_modules/checkout/tests/git.expected/other.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/git.expected/trigger.json b/recipe_modules/checkout/tests/git.expected/trigger.json
index 98b8625..2306184 100644
--- a/recipe_modules/checkout/tests/git.expected/trigger.json
+++ b/recipe_modules/checkout/tests/git.expected/trigger.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index 46147c0..ced8b25 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -214,7 +218,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -274,7 +278,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -316,7 +320,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/ci.json b/recipe_modules/checkout/tests/repo.expected/ci.json
index 079b7b2..84b2f3a 100644
--- a/recipe_modules/checkout/tests/repo.expected/ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/ci.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
index 34756d9..2957311 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
index 986d1aa..13c4923 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
index 1cb1da7..9498f69 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
@@ -30,12 +30,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -43,8 +50,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -59,19 +66,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -86,7 +90,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -101,7 +105,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -111,9 +115,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -132,7 +136,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -140,7 +144,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -150,7 +154,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -214,7 +218,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -278,7 +282,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -338,7 +342,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://default-review.googlesource.com",
@@ -380,7 +384,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
index 7747c38..1cd15ee 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -277,7 +281,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -337,7 +341,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://default-review.googlesource.com",
@@ -379,7 +383,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
index a78a804..bb71bc0 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
@@ -30,12 +30,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -43,8 +50,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -59,19 +66,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -86,7 +90,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -101,7 +105,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -111,9 +115,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -132,7 +136,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -140,7 +144,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -150,7 +154,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -214,7 +218,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -278,7 +282,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -338,7 +342,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://default-review.googlesource.com",
@@ -380,7 +384,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/no_trigger.json b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
index e9ac777..17176b4 100644
--- a/recipe_modules/checkout/tests/repo.expected/no_trigger.json
+++ b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/prefix.json b/recipe_modules/checkout/tests/repo.expected/prefix.json
index 70d098f..45781e4 100644
--- a/recipe_modules/checkout/tests/repo.expected/prefix.json
+++ b/recipe_modules/checkout/tests/repo.expected/prefix.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://foo-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://foo-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://foo-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://foo-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
index 1713e51..2bb8c92 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
@@ -30,12 +30,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -43,8 +50,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -59,19 +66,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -86,7 +90,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -101,7 +105,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -111,9 +115,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -132,7 +136,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -140,7 +144,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -150,7 +154,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -214,7 +218,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -275,7 +279,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -317,7 +321,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -393,7 +397,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -454,7 +458,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://default-review.googlesource.com",
@@ -496,7 +500,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -579,7 +583,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
index 2d02675..2ad4bf9 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
@@ -32,12 +32,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -45,8 +52,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -61,19 +68,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -88,7 +92,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -103,7 +107,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -113,9 +117,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -134,7 +138,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -142,7 +146,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -152,7 +156,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -216,7 +220,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -280,7 +284,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -344,7 +348,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -404,7 +408,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -446,7 +450,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple.json b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
index 5c6d836..fc01100 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
@@ -30,12 +30,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -43,8 +50,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -59,19 +66,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -86,7 +90,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -101,7 +105,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -111,9 +115,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -132,7 +136,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -140,7 +144,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -150,7 +154,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -214,7 +218,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -278,7 +282,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
@@ -338,7 +342,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://default-review.googlesource.com",
@@ -380,7 +384,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try.json b/recipe_modules/checkout/tests/repo.expected/try.json
index 6553c1d..03ace2c 100644
--- a/recipe_modules/checkout/tests/repo.expected/try.json
+++ b/recipe_modules/checkout/tests/repo.expected/try.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
index 883cbb7..ffe826a 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
index 29e6005..c174007 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://foo-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://foo-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://foo-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://foo-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/insteadof.json b/recipe_modules/checkout/tests/submodule.expected/insteadof.json
index 9b3fb0e..26fe8cd 100644
--- a/recipe_modules/checkout/tests/submodule.expected/insteadof.json
+++ b/recipe_modules/checkout/tests/submodule.expected/insteadof.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
index ad90a05..1438125 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
index d5da57e..698136a 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
index 3531ce9..c196648 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
index b0bc681..3ed5a2b 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
index 76ba647..1560dcc 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://z-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://z-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://z-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://z-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
index e6efcc5..b392ac2 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
index e38a658..3b1d764 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
index e10fb74..4c141fd 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
index 49a6a77..c3e543f 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
index 102ebea..afe2b11 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,8 +51,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -60,19 +67,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -87,7 +91,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -102,7 +106,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -112,9 +116,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -133,7 +137,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -141,7 +145,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -151,7 +155,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -215,7 +219,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -276,7 +280,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -318,7 +322,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -395,7 +399,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -456,7 +460,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -498,7 +502,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -558,7 +562,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -619,7 +623,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -661,7 +665,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -760,7 +764,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -817,7 +821,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
index ad4f368..cba4b79 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
@@ -33,12 +33,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -46,8 +53,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -62,19 +69,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -89,7 +93,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -104,7 +108,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -114,9 +118,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -135,7 +139,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -143,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -153,7 +157,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -217,7 +221,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -278,7 +282,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -320,7 +324,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -398,7 +402,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -459,7 +463,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -501,7 +505,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -561,7 +565,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -622,7 +626,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -664,7 +668,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -724,7 +728,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://forbidden-review.googlesource.com",
@@ -768,7 +772,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://forbidden-review.googlesource.com",
@@ -851,7 +855,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -908,7 +912,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
index ec38eda..eed1987 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
@@ -32,12 +32,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -45,8 +52,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -61,19 +68,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -88,7 +92,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -103,7 +107,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -113,9 +117,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -134,7 +138,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -142,7 +146,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -152,7 +156,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -216,7 +220,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -280,7 +284,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -344,7 +348,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -404,7 +408,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -446,7 +450,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
index 12ab96b..5aec747 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,8 +51,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -60,19 +67,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -87,7 +91,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -102,7 +106,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -112,9 +116,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -133,7 +137,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -141,7 +145,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -151,7 +155,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -215,7 +219,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -279,7 +283,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -343,7 +347,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -403,7 +407,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -445,7 +449,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
index 98d7f49..d54ffc8 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
index 97bcf08..cd5605b 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://x-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://x-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/abandoned.json b/recipe_modules/cq_deps/tests/full.expected/abandoned.json
index 6457585..65500b9 100644
--- a/recipe_modules/cq_deps/tests/full.expected/abandoned.json
+++ b/recipe_modules/cq_deps/tests/full.expected/abandoned.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/bad_field_name.json b/recipe_modules/cq_deps/tests/full.expected/bad_field_name.json
index fa9a08b..019c299 100644
--- a/recipe_modules/cq_deps/tests/full.expected/bad_field_name.json
+++ b/recipe_modules/cq_deps/tests/full.expected/bad_field_name.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/cl-not-found.json b/recipe_modules/cq_deps/tests/full.expected/cl-not-found.json
index dbae991..7d3d7f0 100644
--- a/recipe_modules/cq_deps/tests/full.expected/cl-not-found.json
+++ b/recipe_modules/cq_deps/tests/full.expected/cl-not-found.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/commas.json b/recipe_modules/cq_deps/tests/full.expected/commas.json
index 3a1d20b..3d9579f 100644
--- a/recipe_modules/cq_deps/tests/full.expected/commas.json
+++ b/recipe_modules/cq_deps/tests/full.expected/commas.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -280,7 +284,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -310,7 +314,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/dependency-requires-parent.json b/recipe_modules/cq_deps/tests/full.expected/dependency-requires-parent.json
index a2319c8..fa5c48a 100644
--- a/recipe_modules/cq_deps/tests/full.expected/dependency-requires-parent.json
+++ b/recipe_modules/cq_deps/tests/full.expected/dependency-requires-parent.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -281,7 +285,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -311,7 +315,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/error.json b/recipe_modules/cq_deps/tests/full.expected/error.json
index 5d1fb33..bc81c8a 100644
--- a/recipe_modules/cq_deps/tests/full.expected/error.json
+++ b/recipe_modules/cq_deps/tests/full.expected/error.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -266,7 +270,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/error_recovery.json b/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
index de144b2..bd62094 100644
--- a/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
+++ b/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -266,7 +270,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -345,7 +349,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/forbidden.json b/recipe_modules/cq_deps/tests/full.expected/forbidden.json
index c7f5274..45d524a 100644
--- a/recipe_modules/cq_deps/tests/full.expected/forbidden.json
+++ b/recipe_modules/cq_deps/tests/full.expected/forbidden.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://forbidden-review.googlesource.com",
@@ -264,7 +268,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://forbidden-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/gibberish-requirement.json b/recipe_modules/cq_deps/tests/full.expected/gibberish-requirement.json
index c08125d..f53788b 100644
--- a/recipe_modules/cq_deps/tests/full.expected/gibberish-requirement.json
+++ b/recipe_modules/cq_deps/tests/full.expected/gibberish-requirement.json
@@ -8,12 +8,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -21,23 +28,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -52,10 +56,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -65,16 +69,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -82,7 +86,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -92,7 +96,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -141,7 +145,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -171,7 +175,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/hash.json b/recipe_modules/cq_deps/tests/full.expected/hash.json
index 961dc14..1125207 100644
--- a/recipe_modules/cq_deps/tests/full.expected/hash.json
+++ b/recipe_modules/cq_deps/tests/full.expected/hash.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -119,7 +123,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -198,7 +202,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/ignore_errors.json b/recipe_modules/cq_deps/tests/full.expected/ignore_errors.json
index 40585fa..364baef 100644
--- a/recipe_modules/cq_deps/tests/full.expected/ignore_errors.json
+++ b/recipe_modules/cq_deps/tests/full.expected/ignore_errors.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/loop_three.json b/recipe_modules/cq_deps/tests/full.expected/loop_three.json
index b244d47..91a4212 100644
--- a/recipe_modules/cq_deps/tests/full.expected/loop_three.json
+++ b/recipe_modules/cq_deps/tests/full.expected/loop_three.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -281,7 +285,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -311,7 +315,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -375,7 +379,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -424,7 +428,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -454,7 +458,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/loop_two.json b/recipe_modules/cq_deps/tests/full.expected/loop_two.json
index dd1ed40..e1cfcde 100644
--- a/recipe_modules/cq_deps/tests/full.expected/loop_two.json
+++ b/recipe_modules/cq_deps/tests/full.expected/loop_two.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -281,7 +285,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -311,7 +315,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/merged_ok.json b/recipe_modules/cq_deps/tests/full.expected/merged_ok.json
index f95d4f4..cf9baca 100644
--- a/recipe_modules/cq_deps/tests/full.expected/merged_ok.json
+++ b/recipe_modules/cq_deps/tests/full.expected/merged_ok.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -297,7 +301,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -345,7 +349,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -375,7 +379,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json b/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
index 56741b5..426fd1c 100644
--- a/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
+++ b/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/multiline.json b/recipe_modules/cq_deps/tests/full.expected/multiline.json
index 6453926..dc43cf2 100644
--- a/recipe_modules/cq_deps/tests/full.expected/multiline.json
+++ b/recipe_modules/cq_deps/tests/full.expected/multiline.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -233,7 +237,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -281,7 +285,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -311,7 +315,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -359,7 +363,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -407,7 +411,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/no-parent-cl.json b/recipe_modules/cq_deps/tests/full.expected/no-parent-cl.json
index 1d35cfc..79dfef1 100644
--- a/recipe_modules/cq_deps/tests/full.expected/no-parent-cl.json
+++ b/recipe_modules/cq_deps/tests/full.expected/no-parent-cl.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/no_gerrit_name.json b/recipe_modules/cq_deps/tests/full.expected/no_gerrit_name.json
index 75215e7..96093bd 100644
--- a/recipe_modules/cq_deps/tests/full.expected/no_gerrit_name.json
+++ b/recipe_modules/cq_deps/tests/full.expected/no_gerrit_name.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -280,7 +284,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -310,7 +314,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/no_space.json b/recipe_modules/cq_deps/tests/full.expected/no_space.json
index 4cb6dd0..bebc58b 100644
--- a/recipe_modules/cq_deps/tests/full.expected/no_space.json
+++ b/recipe_modules/cq_deps/tests/full.expected/no_space.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -233,7 +237,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -281,7 +285,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -311,7 +315,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -359,7 +363,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -407,7 +411,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/one.json b/recipe_modules/cq_deps/tests/full.expected/one.json
index c928a19..46c1eef 100644
--- a/recipe_modules/cq_deps/tests/full.expected/one.json
+++ b/recipe_modules/cq_deps/tests/full.expected/one.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -232,7 +236,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -280,7 +284,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -310,7 +314,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/out-of-date-parent.json b/recipe_modules/cq_deps/tests/full.expected/out-of-date-parent.json
index 5738c60..43442da 100644
--- a/recipe_modules/cq_deps/tests/full.expected/out-of-date-parent.json
+++ b/recipe_modules/cq_deps/tests/full.expected/out-of-date-parent.json
@@ -8,12 +8,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -21,23 +28,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -52,10 +56,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -65,16 +69,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -82,7 +86,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -92,7 +96,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -141,7 +145,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -171,7 +175,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -220,7 +224,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -250,7 +254,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/two.json b/recipe_modules/cq_deps/tests/full.expected/two.json
index 0498bcb..fe3aeb6 100644
--- a/recipe_modules/cq_deps/tests/full.expected/two.json
+++ b/recipe_modules/cq_deps/tests/full.expected/two.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -233,7 +237,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -281,7 +285,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -311,7 +315,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -359,7 +363,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -407,7 +411,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/unsubmitted-parent-dependencies.json b/recipe_modules/cq_deps/tests/full.expected/unsubmitted-parent-dependencies.json
index a460545..048df64 100644
--- a/recipe_modules/cq_deps/tests/full.expected/unsubmitted-parent-dependencies.json
+++ b/recipe_modules/cq_deps/tests/full.expected/unsubmitted-parent-dependencies.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,23 +25,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.read manifest",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -49,10 +53,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -62,16 +66,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "resolve CL deps.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -79,7 +83,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -89,7 +93,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -138,7 +142,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -217,7 +221,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -247,7 +251,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -327,7 +331,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -375,7 +379,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -405,7 +409,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/gerrit_comment/tests/full.expected/try-build.json b/recipe_modules/gerrit_comment/tests/full.expected/try-build.json
index 532cb2f..00b6f5b 100644
--- a/recipe_modules/gerrit_comment/tests/full.expected/try-build.json
+++ b/recipe_modules/gerrit_comment/tests/full.expected/try-build.json
@@ -15,12 +15,19 @@
},
{
"cmd": [],
- "name": "maybe post (2).ensure gerrit",
+ "name": "maybe post (2).ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "maybe post (2).ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -28,8 +35,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -44,19 +51,16 @@
"hostname": "rdbhost"
}
},
- "name": "maybe post (2).ensure gerrit.read manifest",
+ "name": "maybe post (2).ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "maybe post (2).ensure gerrit.install path/to/gerrit",
+ "name": "maybe post (2).ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -71,7 +75,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -86,7 +90,7 @@
"hostname": "rdbhost"
}
},
- "name": "maybe post (2).ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "maybe post (2).ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -96,9 +100,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -117,7 +121,7 @@
"hostname": "rdbhost"
}
},
- "name": "maybe post (2).ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "maybe post (2).ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -125,7 +129,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -135,7 +139,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
index 4f84ff6..5078134 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
@@ -188,12 +188,19 @@
},
{
"cmd": [],
- "name": "step1.maybe post.ensure gerrit",
+ "name": "step1.maybe post.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "step1.maybe post.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -201,8 +208,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -217,19 +224,16 @@
"hostname": "rdbhost"
}
},
- "name": "step1.maybe post.ensure gerrit.read manifest",
+ "name": "step1.maybe post.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "step1.maybe post.ensure gerrit.install path/to/gerrit",
+ "name": "step1.maybe post.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -244,7 +248,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -259,7 +263,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.maybe post.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "step1.maybe post.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -269,9 +273,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -290,7 +294,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.maybe post.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "step1.maybe post.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -298,7 +302,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -308,7 +312,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1544,7 +1548,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
index 4f39fe0..c2cf77b 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
@@ -50,12 +50,19 @@
},
{
"cmd": [],
- "name": "abc.ensure gerrit",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -63,24 +70,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.read manifest",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "abc.ensure gerrit.install path/to/gerrit",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -95,11 +99,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -109,9 +113,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -119,7 +123,7 @@
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -127,7 +131,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -137,7 +141,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -264,7 +268,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -295,7 +299,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -342,7 +346,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -373,7 +377,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -420,7 +424,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -451,7 +455,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -547,7 +551,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -578,7 +582,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -625,7 +629,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -656,7 +660,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
index 2590e4e..2d296f7 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
@@ -50,12 +50,19 @@
},
{
"cmd": [],
- "name": "abc.ensure gerrit",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -63,24 +70,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.read manifest",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "abc.ensure gerrit.install path/to/gerrit",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -95,11 +99,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -109,9 +113,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -119,7 +123,7 @@
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -127,7 +131,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -137,7 +141,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -215,7 +219,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -246,7 +250,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -293,7 +297,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -324,7 +328,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -420,7 +424,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -451,7 +455,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -498,7 +502,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -529,7 +533,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -576,7 +580,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -607,7 +611,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -703,7 +707,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -734,7 +738,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -781,7 +785,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -812,7 +816,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -859,7 +863,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -890,7 +894,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
index dd0d9e4..dd16a44 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
@@ -50,12 +50,19 @@
},
{
"cmd": [],
- "name": "abc.ensure gerrit",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -63,24 +70,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.read manifest",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "abc.ensure gerrit.install path/to/gerrit",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -95,11 +99,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -109,9 +113,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -119,7 +123,7 @@
],
"cwd": "[START_DIR]/abc",
"infra_step": true,
- "name": "abc.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "abc.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -127,7 +131,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -137,7 +141,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -168,7 +172,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -264,7 +268,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -295,7 +299,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -391,7 +395,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -422,7 +426,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/backwards.json b/recipe_modules/roll_util/tests/single_roll.expected/backwards.json
index 09e907d..c5e215e 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/backwards.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/backwards.json
@@ -47,7 +47,14 @@
},
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -57,23 +64,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -88,10 +92,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -101,16 +105,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -118,7 +122,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -128,7 +132,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -157,7 +161,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -194,7 +198,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -260,7 +264,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json b/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
index 39d777b..d77ea69 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
@@ -89,12 +89,19 @@
},
{
"cmd": [],
- "name": "proj.ensure gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -102,24 +109,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.read manifest",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "proj.ensure gerrit.install path/to/gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -134,11 +138,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -148,9 +152,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -158,7 +162,7 @@
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -166,7 +170,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -176,7 +180,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -207,7 +211,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -254,7 +258,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -285,7 +289,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -332,7 +336,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -363,7 +367,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -410,7 +414,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -441,7 +445,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -488,7 +492,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -519,7 +523,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -647,7 +651,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -676,7 +680,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -713,7 +717,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -779,7 +783,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/manymanycommit.json b/recipe_modules/roll_util/tests/single_roll.expected/manymanycommit.json
index b026a86..a957c76 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/manymanycommit.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/manymanycommit.json
@@ -87,12 +87,19 @@
},
{
"cmd": [],
- "name": "proj.ensure gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -100,24 +107,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.read manifest",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "proj.ensure gerrit.install path/to/gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -132,11 +136,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -146,9 +150,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -156,7 +160,7 @@
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -164,7 +168,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -174,7 +178,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -205,7 +209,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -252,7 +256,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -283,7 +287,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -330,7 +334,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -361,7 +365,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -408,7 +412,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -439,7 +443,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -486,7 +490,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -517,7 +521,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -564,7 +568,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -595,7 +599,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -642,7 +646,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -673,7 +677,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -720,7 +724,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -751,7 +755,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -798,7 +802,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -829,7 +833,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -876,7 +880,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -907,7 +911,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1045,7 +1049,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1074,7 +1078,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1111,7 +1115,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1177,7 +1181,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json b/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
index e301c38..28de80c 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
@@ -87,12 +87,19 @@
},
{
"cmd": [],
- "name": "proj.ensure gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -100,24 +107,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.read manifest",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "proj.ensure gerrit.install path/to/gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -132,11 +136,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -146,9 +150,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -156,7 +160,7 @@
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -164,7 +168,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -174,7 +178,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -205,7 +209,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -252,7 +256,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -283,7 +287,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -330,7 +334,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -361,7 +365,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -408,7 +412,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -439,7 +443,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -563,7 +567,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -592,7 +596,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -629,7 +633,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -695,7 +699,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/rebase.json b/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
index 40a0562..de445bd 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
@@ -89,12 +89,19 @@
},
{
"cmd": [],
- "name": "proj.ensure gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -102,24 +109,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.read manifest",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "proj.ensure gerrit.install path/to/gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -134,11 +138,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -148,9 +152,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -158,7 +162,7 @@
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -166,7 +170,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -176,7 +180,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -207,7 +211,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -254,7 +258,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -285,7 +289,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -332,7 +336,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -363,7 +367,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -410,7 +414,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -441,7 +445,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -488,7 +492,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -519,7 +523,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -645,7 +649,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -674,7 +678,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -711,7 +715,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -777,7 +781,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
index 133552d..0e01b7d 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
@@ -87,12 +87,19 @@
},
{
"cmd": [],
- "name": "proj.ensure gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -100,24 +107,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.read manifest",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "proj.ensure gerrit.install path/to/gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -132,11 +136,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -146,9 +150,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -156,7 +160,7 @@
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -164,7 +168,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -174,7 +178,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -205,7 +209,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -330,7 +334,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -359,7 +363,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -396,7 +400,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -462,7 +466,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
index 04baa78..7c90123 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
@@ -87,12 +87,19 @@
},
{
"cmd": [],
- "name": "proj.ensure gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -100,24 +107,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.read manifest",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "proj.ensure gerrit.install path/to/gerrit",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -132,11 +136,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -146,9 +150,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -156,7 +160,7 @@
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "proj.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "proj.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -164,7 +168,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -174,7 +178,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -205,7 +209,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -324,7 +328,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -353,7 +357,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -390,7 +394,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -456,7 +460,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/up_to_date.json b/recipe_modules/roll_util/tests/single_roll.expected/up_to_date.json
index bc88348..88b0632 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/up_to_date.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/up_to_date.json
@@ -16,7 +16,14 @@
},
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -26,23 +33,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -57,10 +61,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -70,16 +74,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -87,7 +91,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -97,7 +101,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -126,7 +130,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -163,7 +167,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -229,7 +233,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/up_to_date_testonly.json b/recipe_modules/roll_util/tests/single_roll.expected/up_to_date_testonly.json
index a6d3614..eb77701 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/up_to_date_testonly.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/up_to_date_testonly.json
@@ -52,7 +52,14 @@
},
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -62,23 +69,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -93,10 +97,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -106,16 +110,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -123,7 +127,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -133,7 +137,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -162,7 +166,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -199,7 +203,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -265,7 +269,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/util/tests/full.expected/found.json b/recipe_modules/util/tests/full.expected/found.json
index 468dbfc..8e45d0a 100644
--- a/recipe_modules/util/tests/full.expected/found.json
+++ b/recipe_modules/util/tests/full.expected/found.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,8 +25,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -34,19 +41,16 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.read manifest",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit.install path/to/gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -61,7 +65,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -76,7 +80,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -86,9 +90,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -107,7 +111,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -125,7 +129,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://chromium-review.googlesource.com",
@@ -184,7 +188,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://chromium-review.googlesource.com",
diff --git a/recipe_modules/util/tests/full.expected/not_found.json b/recipe_modules/util/tests/full.expected/not_found.json
index ca413a3..33dbb11 100644
--- a/recipe_modules/util/tests/full.expected/not_found.json
+++ b/recipe_modules/util/tests/full.expected/not_found.json
@@ -8,12 +8,19 @@
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -21,8 +28,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -37,19 +44,16 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.read manifest",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit.install path/to/gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -64,7 +68,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -79,7 +83,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -89,9 +93,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -110,7 +114,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -118,7 +122,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -128,7 +132,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://chromium-review.googlesource.com",
@@ -187,7 +191,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://chromium-review.googlesource.com",
diff --git a/recipes/bazel.expected/simple.json b/recipes/bazel.expected/simple.json
index 28c1224..1b29a38 100644
--- a/recipes/bazel.expected/simple.json
+++ b/recipes/bazel.expected/simple.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index 63b0b03..3ce06bc 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/build.expected/skip_archive.json b/recipes/build.expected/skip_archive.json
index 4e43316..f629b0f 100644
--- a/recipes/build.expected/skip_archive.json
+++ b/recipes/build.expected/skip_archive.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/cipd_roller.expected/multiple.json b/recipes/cipd_roller.expected/multiple.json
index a720bbc..6b04276 100644
--- a/recipes/cipd_roller.expected/multiple.json
+++ b/recipes/cipd_roller.expected/multiple.json
@@ -1787,7 +1787,14 @@
},
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1797,8 +1804,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1814,19 +1821,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1841,7 +1845,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1857,7 +1861,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1867,9 +1871,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1889,7 +1893,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1897,7 +1901,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1907,7 +1911,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2011,7 +2015,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2073,7 +2077,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
index 811162a..d10814f 100644
--- a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
+++ b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
@@ -1414,7 +1414,14 @@
},
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1424,8 +1431,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1441,19 +1448,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1468,7 +1472,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1484,7 +1488,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1494,9 +1498,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1516,7 +1520,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1524,7 +1528,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1534,7 +1538,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1638,7 +1642,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1700,7 +1704,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/cipd_roller.expected/no_curlies_in_spec.json b/recipes/cipd_roller.expected/no_curlies_in_spec.json
index 41f85f6..4adebe2 100644
--- a/recipes/cipd_roller.expected/no_curlies_in_spec.json
+++ b/recipes/cipd_roller.expected/no_curlies_in_spec.json
@@ -1374,7 +1374,14 @@
},
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1384,8 +1391,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1401,19 +1408,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1428,7 +1432,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1444,7 +1448,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1454,9 +1458,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1476,7 +1480,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1484,7 +1488,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1494,7 +1498,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1598,7 +1602,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1660,7 +1664,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/cipd_roller.expected/platform-independent.json b/recipes/cipd_roller.expected/platform-independent.json
index 1c21368..a0ce096 100644
--- a/recipes/cipd_roller.expected/platform-independent.json
+++ b/recipes/cipd_roller.expected/platform-independent.json
@@ -1248,7 +1248,14 @@
},
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1258,8 +1265,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1275,19 +1282,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1302,7 +1306,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1318,7 +1322,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1328,9 +1332,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1350,7 +1354,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1358,7 +1362,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1368,7 +1372,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1472,7 +1476,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1534,7 +1538,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/cipd_roller.expected/success.json b/recipes/cipd_roller.expected/success.json
index 51f5100..3e43ce0 100644
--- a/recipes/cipd_roller.expected/success.json
+++ b/recipes/cipd_roller.expected/success.json
@@ -1374,7 +1374,14 @@
},
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1384,8 +1391,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1401,19 +1408,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1428,7 +1432,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/co",
"infra_step": true,
@@ -1444,7 +1448,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1454,9 +1458,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1476,7 +1480,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1484,7 +1488,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1494,7 +1498,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1598,7 +1602,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1660,7 +1664,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/docs_builder.expected/docs-dry_run-build.json b/recipes/docs_builder.expected/docs-dry_run-build.json
index b70511f..0fd2c27 100644
--- a/recipes/docs_builder.expected/docs-dry_run-build.json
+++ b/recipes/docs_builder.expected/docs-dry_run-build.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -963,7 +967,14 @@
},
{
"cmd": [],
- "name": "ensure gsutil"
+ "name": "ensure infra/3pp/tools/gsutil"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/3pp/tools/gsutil.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -973,23 +984,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gsutil]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "ensure gsutil.read manifest",
+ "name": "ensure infra/3pp/tools/gsutil.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gsutil version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gsutil.install path/to/gsutil",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1004,10 +1012,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version"
],
"infra_step": true,
- "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1017,16 +1025,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version",
"-ensure-file",
- "path/to/gsutil version:pinned-version",
+ "infra/3pp/tools/gsutil version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gsutil.install path/to/gsutil.ensure_installed",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1034,7 +1042,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/gsutil\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1044,7 +1052,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:42.500000Z",
"-o",
@@ -1063,7 +1071,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/docs_builder.expected/docs-postsubmit.json b/recipes/docs_builder.expected/docs-postsubmit.json
index 845f10a..7ad7660 100644
--- a/recipes/docs_builder.expected/docs-postsubmit.json
+++ b/recipes/docs_builder.expected/docs-postsubmit.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1875,7 +1879,14 @@
},
{
"cmd": [],
- "name": "ensure gsutil"
+ "name": "ensure infra/3pp/tools/gsutil"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/3pp/tools/gsutil.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1885,23 +1896,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gsutil]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "ensure gsutil.read manifest",
+ "name": "ensure infra/3pp/tools/gsutil.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gsutil version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gsutil.install path/to/gsutil",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1916,10 +1924,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version"
],
"infra_step": true,
- "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1929,16 +1937,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version",
"-ensure-file",
- "path/to/gsutil version:pinned-version",
+ "infra/3pp/tools/gsutil version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gsutil.install path/to/gsutil.ensure_installed",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1946,7 +1954,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/gsutil\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1956,7 +1964,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:47.000000Z",
"-o",
@@ -1975,7 +1983,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2019,7 +2027,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:48.500000Z",
"-o",
@@ -2036,7 +2044,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:50.000000Z",
"-o",
diff --git a/recipes/docs_builder.expected/docs-presubmit.json b/recipes/docs_builder.expected/docs-presubmit.json
index 7ab479b..3a4a4a7 100644
--- a/recipes/docs_builder.expected/docs-presubmit.json
+++ b/recipes/docs_builder.expected/docs-presubmit.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -3093,7 +3097,14 @@
},
{
"cmd": [],
- "name": "ensure gsutil"
+ "name": "ensure infra/3pp/tools/gsutil"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/3pp/tools/gsutil.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -3103,8 +3114,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gsutil]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -3119,19 +3130,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gsutil.read manifest",
+ "name": "ensure infra/3pp/tools/gsutil.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gsutil version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gsutil.install path/to/gsutil",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -3146,7 +3154,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -3161,7 +3169,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -3171,9 +3179,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version",
"-ensure-file",
- "path/to/gsutil version:pinned-version",
+ "infra/3pp/tools/gsutil version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -3192,7 +3200,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gsutil.install path/to/gsutil.ensure_installed",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -3200,7 +3208,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/gsutil\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -3210,7 +3218,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:47.000000Z",
"-o",
@@ -3241,7 +3249,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index ec43ea8..2c31181 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index 500bd31..46da86f 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index 0bbde3a..2bd5c07 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index bcdffa0..cd363f4 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]\\resources\\tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]\\resources\\cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\cipd_tool\\path\\to\\gerrit\\version%3Apinned-version"
+ "[START_DIR]\\cipd_tool\\infra\\tools\\luci\\gerrit\\version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd.bat",
"ensure",
"-root",
- "[START_DIR]\\cipd_tool\\path\\to\\gerrit\\version%3Apinned-version",
+ "[START_DIR]\\cipd_tool\\infra\\tools\\luci\\gerrit\\version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]\\cipd_tool\\path\\to\\gerrit\\version%3Apinned-version\\gerrit",
+ "[START_DIR]\\cipd_tool\\infra\\tools\\luci\\gerrit\\version%3Apinned-version\\gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/gerrit_auto_submit.expected/default.json b/recipes/gerrit_auto_submit.expected/default.json
index c737054..153d4e9 100644
--- a/recipes/gerrit_auto_submit.expected/default.json
+++ b/recipes/gerrit_auto_submit.expected/default.json
@@ -26,12 +26,19 @@
},
{
"cmd": [],
- "name": "get eligible.ensure gerrit",
+ "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -39,23 +46,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "get eligible.ensure gerrit.read manifest",
+ "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "get eligible.ensure gerrit.install path/to/gerrit",
+ "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -70,10 +74,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "get eligible.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -83,16 +87,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "get eligible.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -100,7 +104,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -110,7 +114,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://fuchsia-review.googlesource.com",
@@ -162,7 +166,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://fuchsia-review.googlesource.com",
@@ -189,7 +193,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"changes-submitted-together",
"-host",
"https://fuchsia-review.googlesource.com",
@@ -233,7 +237,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"get-mergeable",
"-host",
"https://fuchsia-review.googlesource.com",
@@ -261,7 +265,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://fuchsia-review.googlesource.com",
diff --git a/recipes/luci_config.expected/starlark.json b/recipes/luci_config.expected/starlark.json
index 3b90e88..070a64a 100644
--- a/recipes/luci_config.expected/starlark.json
+++ b/recipes/luci_config.expected/starlark.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1833,7 +1837,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/pw_presubmit.expected/one_step_no_exit_not_in_cv.json b/recipes/pw_presubmit.expected/one_step_no_exit_not_in_cv.json
index de97848..94136b3 100644
--- a/recipes/pw_presubmit.expected/one_step_no_exit_not_in_cv.json
+++ b/recipes/pw_presubmit.expected/one_step_no_exit_not_in_cv.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/pw_presubmit.expected/one_step_no_exit_not_tryjob.json b/recipes/pw_presubmit.expected/one_step_no_exit_not_tryjob.json
index 1f1ba70..5784110 100644
--- a/recipes/pw_presubmit.expected/one_step_no_exit_not_tryjob.json
+++ b/recipes/pw_presubmit.expected/one_step_no_exit_not_tryjob.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/pw_presubmit.expected/one_step_no_exit_passing_in_ci.json b/recipes/pw_presubmit.expected/one_step_no_exit_passing_in_ci.json
index de97848..94136b3 100644
--- a/recipes/pw_presubmit.expected/one_step_no_exit_passing_in_ci.json
+++ b/recipes/pw_presubmit.expected/one_step_no_exit_passing_in_ci.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index 5f09887..5502284 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -3050,12 +3054,19 @@
},
{
"cmd": [],
- "name": "upload.ensure gsutil",
+ "name": "upload.ensure infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "upload.ensure infra/3pp/tools/gsutil.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -3063,8 +3074,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gsutil]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -3079,19 +3090,16 @@
"hostname": "rdbhost"
}
},
- "name": "upload.ensure gsutil.read manifest",
+ "name": "upload.ensure infra/3pp/tools/gsutil.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gsutil version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "upload.ensure gsutil.install path/to/gsutil",
+ "name": "upload.ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -3106,7 +3114,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -3121,7 +3129,7 @@
"hostname": "rdbhost"
}
},
- "name": "upload.ensure gsutil.install path/to/gsutil.ensure package directory",
+ "name": "upload.ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -3131,9 +3139,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version",
"-ensure-file",
- "path/to/gsutil version:pinned-version",
+ "infra/3pp/tools/gsutil version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -3152,7 +3160,7 @@
"hostname": "rdbhost"
}
},
- "name": "upload.ensure gsutil.install path/to/gsutil.ensure_installed",
+ "name": "upload.ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -3160,7 +3168,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/gsutil\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -3170,7 +3178,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:47.000000Z",
"-o",
@@ -3203,7 +3211,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:48.500000Z",
"-o",
@@ -3234,7 +3242,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:50.000000Z",
"-o",
@@ -3265,7 +3273,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:51.500000Z",
"-h",
@@ -3298,7 +3306,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:53.000000Z",
"-o",
@@ -3329,7 +3337,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:54.500000Z",
"-o",
diff --git a/recipes/pw_presubmit.expected/two_steps.json b/recipes/pw_presubmit.expected/two_steps.json
index 0ad0e08..38afbd2 100644
--- a/recipes/pw_presubmit.expected/two_steps.json
+++ b/recipes/pw_presubmit.expected/two_steps.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -4609,12 +4613,19 @@
},
{
"cmd": [],
- "name": "upload.ensure gsutil",
+ "name": "upload.ensure infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "upload.ensure infra/3pp/tools/gsutil.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -4622,8 +4633,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gsutil]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -4638,19 +4649,16 @@
"hostname": "rdbhost"
}
},
- "name": "upload.ensure gsutil.read manifest",
+ "name": "upload.ensure infra/3pp/tools/gsutil.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gsutil version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "upload.ensure gsutil.install path/to/gsutil",
+ "name": "upload.ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -4665,7 +4673,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -4680,7 +4688,7 @@
"hostname": "rdbhost"
}
},
- "name": "upload.ensure gsutil.install path/to/gsutil.ensure package directory",
+ "name": "upload.ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -4690,9 +4698,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version",
"-ensure-file",
- "path/to/gsutil version:pinned-version",
+ "infra/3pp/tools/gsutil version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -4711,7 +4719,7 @@
"hostname": "rdbhost"
}
},
- "name": "upload.ensure gsutil.install path/to/gsutil.ensure_installed",
+ "name": "upload.ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -4719,7 +4727,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/gsutil\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -4729,7 +4737,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2020-09-13T12:33:20.000000Z",
"-o",
@@ -4762,7 +4770,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2020-09-13T12:33:40.000000Z",
"-o",
@@ -4793,7 +4801,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2020-09-13T12:34:00.000000Z",
"-o",
@@ -4824,7 +4832,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2020-09-13T12:34:20.000000Z",
"-o",
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index 8e6b7cf..a81c3fc 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/dotdot-prefix.json b/recipes/repo_roller.expected/dotdot-prefix.json
index 093d5ab..4f4eaaa 100644
--- a/recipes/repo_roller.expected/dotdot-prefix.json
+++ b/recipes/repo_roller.expected/dotdot-prefix.json
@@ -1785,12 +1785,19 @@
},
{
"cmd": [],
- "name": "g7.ensure gerrit",
+ "name": "g7.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "g7.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -1798,8 +1805,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1815,19 +1822,16 @@
"hostname": "rdbhost"
}
},
- "name": "g7.ensure gerrit.read manifest",
+ "name": "g7.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "g7.ensure gerrit.install path/to/gerrit",
+ "name": "g7.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1842,7 +1846,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1858,7 +1862,7 @@
"hostname": "rdbhost"
}
},
- "name": "g7.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "g7.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -1868,9 +1872,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1890,7 +1894,7 @@
"hostname": "rdbhost"
}
},
- "name": "g7.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "g7.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1898,7 +1902,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1908,7 +1912,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1951,7 +1955,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2194,7 +2198,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://host-review.googlesource.com",
@@ -2300,7 +2304,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://host-review.googlesource.com",
@@ -2362,7 +2366,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/equivalent.json b/recipes/repo_roller.expected/equivalent.json
index b2018cd..50a8cef 100644
--- a/recipes/repo_roller.expected/equivalent.json
+++ b/recipes/repo_roller.expected/equivalent.json
@@ -1844,12 +1844,19 @@
},
{
"cmd": [],
- "name": "b2.ensure gerrit",
+ "name": "b2.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "b2.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -1857,8 +1864,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1874,19 +1881,16 @@
"hostname": "rdbhost"
}
},
- "name": "b2.ensure gerrit.read manifest",
+ "name": "b2.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "b2.ensure gerrit.install path/to/gerrit",
+ "name": "b2.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1901,7 +1905,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1917,7 +1921,7 @@
"hostname": "rdbhost"
}
},
- "name": "b2.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "b2.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -1927,9 +1931,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1949,7 +1953,7 @@
"hostname": "rdbhost"
}
},
- "name": "b2.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "b2.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1957,7 +1961,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1967,7 +1971,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2010,7 +2014,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2076,7 +2080,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://host-review.googlesource.com",
@@ -2121,7 +2125,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://host-review.googlesource.com",
@@ -2354,7 +2358,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://host-review.googlesource.com",
@@ -2460,7 +2464,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://host-review.googlesource.com",
@@ -2522,7 +2526,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/host-dot-dot.json b/recipes/repo_roller.expected/host-dot-dot.json
index 06ed7a2..4b3dff0 100644
--- a/recipes/repo_roller.expected/host-dot-dot.json
+++ b/recipes/repo_roller.expected/host-dot-dot.json
@@ -1785,12 +1785,19 @@
},
{
"cmd": [],
- "name": "f6.ensure gerrit",
+ "name": "f6.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "f6.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -1798,8 +1805,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1815,19 +1822,16 @@
"hostname": "rdbhost"
}
},
- "name": "f6.ensure gerrit.read manifest",
+ "name": "f6.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "f6.ensure gerrit.install path/to/gerrit",
+ "name": "f6.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1842,7 +1846,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1858,7 +1862,7 @@
"hostname": "rdbhost"
}
},
- "name": "f6.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "f6.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -1868,9 +1872,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1890,7 +1894,7 @@
"hostname": "rdbhost"
}
},
- "name": "f6.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "f6.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1898,7 +1902,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1908,7 +1912,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1951,7 +1955,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2194,7 +2198,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://host-review.googlesource.com",
@@ -2300,7 +2304,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://host-review.googlesource.com",
@@ -2362,7 +2366,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/host-prefix.json b/recipes/repo_roller.expected/host-prefix.json
index 45879f3..9a4c4b0 100644
--- a/recipes/repo_roller.expected/host-prefix.json
+++ b/recipes/repo_roller.expected/host-prefix.json
@@ -1785,12 +1785,19 @@
},
{
"cmd": [],
- "name": "h8.ensure gerrit",
+ "name": "h8.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "h8.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -1798,8 +1805,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1815,19 +1822,16 @@
"hostname": "rdbhost"
}
},
- "name": "h8.ensure gerrit.read manifest",
+ "name": "h8.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "h8.ensure gerrit.install path/to/gerrit",
+ "name": "h8.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1842,7 +1846,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1858,7 +1862,7 @@
"hostname": "rdbhost"
}
},
- "name": "h8.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "h8.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -1868,9 +1872,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1890,7 +1894,7 @@
"hostname": "rdbhost"
}
},
- "name": "h8.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "h8.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1898,7 +1902,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1908,7 +1912,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1951,7 +1955,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2194,7 +2198,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://host-review.googlesource.com",
@@ -2300,7 +2304,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://host-review.googlesource.com",
@@ -2362,7 +2366,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
index bb74d39..86e40b1 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
@@ -1119,12 +1119,19 @@
},
{
"cmd": [],
- "name": "c3.ensure gerrit",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -1132,24 +1139,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "c3.ensure gerrit.read manifest",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "c3.ensure gerrit.install path/to/gerrit",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1164,11 +1168,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "c3.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -1178,9 +1182,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1188,7 +1192,7 @@
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "c3.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1196,7 +1200,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1206,7 +1210,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1237,7 +1241,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1408,7 +1412,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://host-review.googlesource.com",
@@ -1478,7 +1482,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://host-review.googlesource.com",
@@ -1528,7 +1532,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/no-trigger-with-upstream.json b/recipes/repo_roller.expected/no-trigger-with-upstream.json
index 659ea70..5dd270c 100644
--- a/recipes/repo_roller.expected/no-trigger-with-upstream.json
+++ b/recipes/repo_roller.expected/no-trigger-with-upstream.json
@@ -1154,12 +1154,19 @@
},
{
"cmd": [],
- "name": "a1.ensure gerrit",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -1167,24 +1174,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "a1.ensure gerrit.read manifest",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "a1.ensure gerrit.install path/to/gerrit",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1199,11 +1203,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "a1.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -1213,9 +1217,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1223,7 +1227,7 @@
],
"cwd": "[START_DIR]/project",
"infra_step": true,
- "name": "a1.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1231,7 +1235,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1241,7 +1245,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1272,7 +1276,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1443,7 +1447,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://host-review.googlesource.com",
@@ -1513,7 +1517,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://host-review.googlesource.com",
@@ -1563,7 +1567,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/success.json b/recipes/repo_roller.expected/success.json
index 788417f..e9ae86a 100644
--- a/recipes/repo_roller.expected/success.json
+++ b/recipes/repo_roller.expected/success.json
@@ -1844,12 +1844,19 @@
},
{
"cmd": [],
- "name": "a1.ensure gerrit",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -1857,8 +1864,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1874,19 +1881,16 @@
"hostname": "rdbhost"
}
},
- "name": "a1.ensure gerrit.read manifest",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "a1.ensure gerrit.install path/to/gerrit",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1901,7 +1905,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1917,7 +1921,7 @@
"hostname": "rdbhost"
}
},
- "name": "a1.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -1927,9 +1931,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1949,7 +1953,7 @@
"hostname": "rdbhost"
}
},
- "name": "a1.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1957,7 +1961,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1967,7 +1971,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2010,7 +2014,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2076,7 +2080,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://host-review.googlesource.com",
@@ -2302,7 +2306,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://host-review.googlesource.com",
@@ -2408,7 +2412,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://host-review.googlesource.com",
@@ -2470,7 +2474,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/upstream-not-set.json b/recipes/repo_roller.expected/upstream-not-set.json
index 1c81b6b..1a044c2 100644
--- a/recipes/repo_roller.expected/upstream-not-set.json
+++ b/recipes/repo_roller.expected/upstream-not-set.json
@@ -1785,12 +1785,19 @@
},
{
"cmd": [],
- "name": "c3.ensure gerrit",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -1798,8 +1805,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1815,19 +1822,16 @@
"hostname": "rdbhost"
}
},
- "name": "c3.ensure gerrit.read manifest",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "c3.ensure gerrit.install path/to/gerrit",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1842,7 +1846,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/project",
"infra_step": true,
@@ -1858,7 +1862,7 @@
"hostname": "rdbhost"
}
},
- "name": "c3.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -1868,9 +1872,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1890,7 +1894,7 @@
"hostname": "rdbhost"
}
},
- "name": "c3.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "c3.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1898,7 +1902,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1908,7 +1912,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1951,7 +1955,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2194,7 +2198,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://host-review.googlesource.com",
@@ -2300,7 +2304,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://host-review.googlesource.com",
@@ -2362,7 +2366,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://host-review.googlesource.com",
diff --git a/recipes/run_script.expected/run_script.json b/recipes/run_script.expected/run_script.json
index 2d45eea..786f5cf 100644
--- a/recipes/run_script.expected/run_script.json
+++ b/recipes/run_script.expected/run_script.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/run_script.expected/variable_substitution.json b/recipes/run_script.expected/variable_substitution.json
index f774554..4a745de 100644
--- a/recipes/run_script.expected/variable_substitution.json
+++ b/recipes/run_script.expected/variable_substitution.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/do-not-submit.json b/recipes/static_checks.expected/do-not-submit.json
index 604a2d6..11705a1 100644
--- a/recipes/static_checks.expected/do-not-submit.json
+++ b/recipes/static_checks.expected/do-not-submit.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://chromium-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://chromium-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.commit-message-ignored.json b/recipes/static_checks.expected/docs.commit-message-ignored.json
index e6e7d3c..b7ab3f6 100644
--- a/recipes/static_checks.expected/docs.commit-message-ignored.json
+++ b/recipes/static_checks.expected/docs.commit-message-ignored.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.gerrit-comment.json b/recipes/static_checks.expected/docs.gerrit-comment.json
index 956802c..3b878ea 100644
--- a/recipes/static_checks.expected/docs.gerrit-comment.json
+++ b/recipes/static_checks.expected/docs.gerrit-comment.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.has_doc_changes.json b/recipes/static_checks.expected/docs.has_doc_changes.json
index 3d500f1..432159e 100644
--- a/recipes/static_checks.expected/docs.has_doc_changes.json
+++ b/recipes/static_checks.expected/docs.has_doc_changes.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -190,7 +194,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.has_doc_changes_properties.json b/recipes/static_checks.expected/docs.has_doc_changes_properties.json
index 05099ec..bddda04 100644
--- a/recipes/static_checks.expected/docs.has_doc_changes_properties.json
+++ b/recipes/static_checks.expected/docs.has_doc_changes_properties.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -190,7 +194,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.no_doc_changes.json b/recipes/static_checks.expected/docs.no_doc_changes.json
index a924a58..5a3e9b3 100644
--- a/recipes/static_checks.expected/docs.no_doc_changes.json
+++ b/recipes/static_checks.expected/docs.no_doc_changes.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.no_doc_changes_new_patchset_run.json b/recipes/static_checks.expected/docs.no_doc_changes_new_patchset_run.json
index 74387fb..a4e42c8 100644
--- a/recipes/static_checks.expected/docs.no_doc_changes_new_patchset_run.json
+++ b/recipes/static_checks.expected/docs.no_doc_changes_new_patchset_run.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.no_doc_changes_properties.json b/recipes/static_checks.expected/docs.no_doc_changes_properties.json
index 5e2fc66..286c7bf 100644
--- a/recipes/static_checks.expected/docs.no_doc_changes_properties.json
+++ b/recipes/static_checks.expected/docs.no_doc_changes_properties.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -190,7 +194,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.owner.json b/recipes/static_checks.expected/docs.owner.json
index d8db9bc..3453b25 100644
--- a/recipes/static_checks.expected/docs.owner.json
+++ b/recipes/static_checks.expected/docs.owner.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.owners-files.json b/recipes/static_checks.expected/docs.owners-files.json
index 36895e2..010dbd8 100644
--- a/recipes/static_checks.expected/docs.owners-files.json
+++ b/recipes/static_checks.expected/docs.owners-files.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -194,7 +198,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.revert.json b/recipes/static_checks.expected/docs.revert.json
index ef933ff..6d6d9b0 100644
--- a/recipes/static_checks.expected/docs.revert.json
+++ b/recipes/static_checks.expected/docs.revert.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.inserted_nontrivial.json b/recipes/static_checks.expected/readability.inserted_nontrivial.json
index 94f0d9a..3d4905c 100644
--- a/recipes/static_checks.expected/readability.inserted_nontrivial.json
+++ b/recipes/static_checks.expected/readability.inserted_nontrivial.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -191,7 +195,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.inserted_trivial.json b/recipes/static_checks.expected/readability.inserted_trivial.json
index d94788a..044f5e0 100644
--- a/recipes/static_checks.expected/readability.inserted_trivial.json
+++ b/recipes/static_checks.expected/readability.inserted_trivial.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -191,7 +195,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -299,7 +303,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.mixed_nontrivial.json b/recipes/static_checks.expected/readability.mixed_nontrivial.json
index 11e1f38..49d0c37 100644
--- a/recipes/static_checks.expected/readability.mixed_nontrivial.json
+++ b/recipes/static_checks.expected/readability.mixed_nontrivial.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -192,7 +196,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.mixed_trivial.json b/recipes/static_checks.expected/readability.mixed_trivial.json
index 99b0bd1..1694b92 100644
--- a/recipes/static_checks.expected/readability.mixed_trivial.json
+++ b/recipes/static_checks.expected/readability.mixed_trivial.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -192,7 +196,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -300,7 +304,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.multiple_nontrivial.json b/recipes/static_checks.expected/readability.multiple_nontrivial.json
index 55da9e6..325fe63 100644
--- a/recipes/static_checks.expected/readability.multiple_nontrivial.json
+++ b/recipes/static_checks.expected/readability.multiple_nontrivial.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -208,7 +212,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.multiple_trivial.json b/recipes/static_checks.expected/readability.multiple_trivial.json
index 7e953d5..7ed124b 100644
--- a/recipes/static_checks.expected/readability.multiple_trivial.json
+++ b/recipes/static_checks.expected/readability.multiple_trivial.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -204,7 +208,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -312,7 +316,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.no_cpp_changes.json b/recipes/static_checks.expected/readability.no_cpp_changes.json
index 9e9ea19..94b5114 100644
--- a/recipes/static_checks.expected/readability.no_cpp_changes.json
+++ b/recipes/static_checks.expected/readability.no_cpp_changes.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -187,7 +191,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.no_label.json b/recipes/static_checks.expected/readability.no_label.json
index 8b6909f..64641f7 100644
--- a/recipes/static_checks.expected/readability.no_label.json
+++ b/recipes/static_checks.expected/readability.no_label.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.removed_nontrivial.json b/recipes/static_checks.expected/readability.removed_nontrivial.json
index cadbb3c..f51d55f 100644
--- a/recipes/static_checks.expected/readability.removed_nontrivial.json
+++ b/recipes/static_checks.expected/readability.removed_nontrivial.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -191,7 +195,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.removed_trivial.json b/recipes/static_checks.expected/readability.removed_trivial.json
index e2cd401..20ae5db 100644
--- a/recipes/static_checks.expected/readability.removed_trivial.json
+++ b/recipes/static_checks.expected/readability.removed_trivial.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -191,7 +195,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -299,7 +303,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/regexp.fail-msg.json b/recipes/static_checks.expected/regexp.fail-msg.json
index cb2bc0d..0a6607a 100644
--- a/recipes/static_checks.expected/regexp.fail-msg.json
+++ b/recipes/static_checks.expected/regexp.fail-msg.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/regexp.fail.json b/recipes/static_checks.expected/regexp.fail.json
index c009bcc..39cd833 100644
--- a/recipes/static_checks.expected/regexp.fail.json
+++ b/recipes/static_checks.expected/regexp.fail.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/regexp.pass.json b/recipes/static_checks.expected/regexp.pass.json
index af625d6..92930af 100644
--- a/recipes/static_checks.expected/regexp.pass.json
+++ b/recipes/static_checks.expected/regexp.pass.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.case.json b/recipes/static_checks.expected/requires.case.json
index 2e7afe8..1130d18 100644
--- a/recipes/static_checks.expected/requires.case.json
+++ b/recipes/static_checks.expected/requires.case.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -275,7 +279,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.first-paragraph.json b/recipes/static_checks.expected/requires.first-paragraph.json
index f8a380c..6b0e24e 100644
--- a/recipes/static_checks.expected/requires.first-paragraph.json
+++ b/recipes/static_checks.expected/requires.first-paragraph.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -275,7 +279,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.forbid.json b/recipes/static_checks.expected/requires.forbid.json
index c05c51f..29f0b43 100644
--- a/recipes/static_checks.expected/requires.forbid.json
+++ b/recipes/static_checks.expected/requires.forbid.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -275,7 +279,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.middle-paragraph.json b/recipes/static_checks.expected/requires.middle-paragraph.json
index 7a6944c..a9acc95 100644
--- a/recipes/static_checks.expected/requires.middle-paragraph.json
+++ b/recipes/static_checks.expected/requires.middle-paragraph.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -275,7 +279,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.multiple-warnings.json b/recipes/static_checks.expected/requires.multiple-warnings.json
index b34b025..1dec4e5 100644
--- a/recipes/static_checks.expected/requires.multiple-warnings.json
+++ b/recipes/static_checks.expected/requires.multiple-warnings.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -283,7 +287,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.no-requires.json b/recipes/static_checks.expected/requires.no-requires.json
index 6bcc0bc..ff9dfd2 100644
--- a/recipes/static_checks.expected/requires.no-requires.json
+++ b/recipes/static_checks.expected/requires.no-requires.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.require.json b/recipes/static_checks.expected/requires.require.json
index 6c2f063..dd49598 100644
--- a/recipes/static_checks.expected/requires.require.json
+++ b/recipes/static_checks.expected/requires.require.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -275,7 +279,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.required.json b/recipes/static_checks.expected/requires.required.json
index e7d18d3..b467833 100644
--- a/recipes/static_checks.expected/requires.required.json
+++ b/recipes/static_checks.expected/requires.required.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -275,7 +279,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.requires-with-autosubmit.json b/recipes/static_checks.expected/requires.requires-with-autosubmit.json
index a9d4c8e..e7d9386 100644
--- a/recipes/static_checks.expected/requires.requires-with-autosubmit.json
+++ b/recipes/static_checks.expected/requires.requires-with-autosubmit.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -189,7 +193,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -279,7 +283,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"set-review",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.valid.json b/recipes/static_checks.expected/requires.valid.json
index 818d12b..8667ba6 100644
--- a/recipes/static_checks.expected/requires.valid.json
+++ b/recipes/static_checks.expected/requires.valid.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/tested.tested-fail.json b/recipes/static_checks.expected/tested.tested-fail.json
index accffd1..d102e93 100644
--- a/recipes/static_checks.expected/tested.tested-fail.json
+++ b/recipes/static_checks.expected/tested.tested-fail.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/tested.tested-pass.json b/recipes/static_checks.expected/tested.tested-pass.json
index 8eeb306..56854ce 100644
--- a/recipes/static_checks.expected/tested.tested-pass.json
+++ b/recipes/static_checks.expected/tested.tested-pass.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/tested.tested-skip.json b/recipes/static_checks.expected/tested.tested-skip.json
index 29be66b..23aa0aa 100644
--- a/recipes/static_checks.expected/tested.tested-skip.json
+++ b/recipes/static_checks.expected/tested.tested-skip.json
@@ -1,7 +1,14 @@
[
{
"cmd": [],
- "name": "ensure gerrit"
+ "name": "ensure infra/tools/luci/gerrit/${platform}"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -11,8 +18,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -27,19 +34,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.read manifest",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gerrit.install path/to/gerrit",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -54,7 +58,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -69,7 +73,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -79,9 +83,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -108,7 +112,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -118,7 +122,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -185,7 +189,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/partial_noop.json b/recipes/submodule_roller.expected/partial_noop.json
index 8eb383f..eb2c1ae 100644
--- a/recipes/submodule_roller.expected/partial_noop.json
+++ b/recipes/submodule_roller.expected/partial_noop.json
@@ -710,12 +710,19 @@
},
{
"cmd": [],
- "name": "a1.ensure gerrit",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -723,24 +730,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/co/a1",
"infra_step": true,
- "name": "a1.ensure gerrit.read manifest",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "a1.ensure gerrit.install path/to/gerrit",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -755,11 +759,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/co/a1",
"infra_step": true,
- "name": "a1.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -769,9 +773,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -779,7 +783,7 @@
],
"cwd": "[START_DIR]/co/a1",
"infra_step": true,
- "name": "a1.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -787,7 +791,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -797,7 +801,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -828,7 +832,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1018,7 +1022,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1051,7 +1055,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1213,7 +1217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1281,7 +1285,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1331,7 +1335,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/success.json b/recipes/submodule_roller.expected/success.json
index 83dcffd..6878903 100644
--- a/recipes/submodule_roller.expected/success.json
+++ b/recipes/submodule_roller.expected/success.json
@@ -710,12 +710,19 @@
},
{
"cmd": [],
- "name": "a1.ensure gerrit",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -723,24 +730,21 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"cwd": "[START_DIR]/co/a1",
"infra_step": true,
- "name": "a1.ensure gerrit.read manifest",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "a1.ensure gerrit.install path/to/gerrit",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -755,11 +759,11 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"cwd": "[START_DIR]/co/a1",
"infra_step": true,
- "name": "a1.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -769,9 +773,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -779,7 +783,7 @@
],
"cwd": "[START_DIR]/co/a1",
"infra_step": true,
- "name": "a1.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "a1.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -787,7 +791,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -797,7 +801,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -828,7 +832,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1039,7 +1043,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1070,7 +1074,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1124,7 +1128,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"account-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1305,7 +1309,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1375,7 +1379,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1425,7 +1429,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index 3bac017..8e9cc74 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/target_to_cipd.expected/success.json b/recipes/target_to_cipd.expected/success.json
index 529e8c0..4fa52fb 100644
--- a/recipes/target_to_cipd.expected/success.json
+++ b/recipes/target_to_cipd.expected/success.json
@@ -22,12 +22,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -35,8 +42,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -51,19 +58,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -78,7 +82,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -93,7 +97,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -103,9 +107,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -124,7 +128,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,7 +136,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -142,7 +146,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index fe14522..fa1fac1 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,8 +25,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -34,19 +41,16 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.read manifest",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit.install path/to/gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -61,7 +65,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -76,7 +80,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -86,9 +90,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -107,7 +111,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -125,7 +129,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -184,7 +188,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -274,7 +278,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -338,7 +342,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -398,7 +402,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -440,7 +444,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_check.expected/comment.json b/recipes/tokendb_check.expected/comment.json
index 16e70c4..7ee9fea 100644
--- a/recipes/tokendb_check.expected/comment.json
+++ b/recipes/tokendb_check.expected/comment.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,8 +25,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -34,19 +41,16 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.read manifest",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit.install path/to/gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -61,7 +65,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -76,7 +80,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -86,9 +90,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -107,7 +111,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -125,7 +129,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -184,7 +188,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index b998dce..61ecae5 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,8 +25,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -34,19 +41,16 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.read manifest",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit.install path/to/gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -61,7 +65,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -76,7 +80,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -86,9 +90,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -107,7 +111,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -125,7 +129,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -184,7 +188,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -274,7 +278,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -338,7 +342,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -398,7 +402,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -440,7 +444,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index c95a473..fa937fb 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,8 +25,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -34,19 +41,16 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.read manifest",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit.install path/to/gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -61,7 +65,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -76,7 +80,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -86,9 +90,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -107,7 +111,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -125,7 +129,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -184,7 +188,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -274,7 +278,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -338,7 +342,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -398,7 +402,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -440,7 +444,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_check.expected/update.json b/recipes/tokendb_check.expected/update.json
index 919eb60..46fb7db 100644
--- a/recipes/tokendb_check.expected/update.json
+++ b/recipes/tokendb_check.expected/update.json
@@ -5,12 +5,19 @@
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -18,8 +25,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -34,19 +41,16 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.read manifest",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "gerrit.ensure gerrit.install path/to/gerrit",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -61,7 +65,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -76,7 +80,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -86,9 +90,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -107,7 +111,7 @@
"hostname": "rdbhost"
}
},
- "name": "gerrit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "gerrit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -125,7 +129,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -184,7 +188,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"list-change-comments",
"-host",
"https://pigweed-review.googlesource.com",
@@ -274,7 +278,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -338,7 +342,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -398,7 +402,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -440,7 +444,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_updater.expected/dry-run.json b/recipes/tokendb_updater.expected/dry-run.json
index 0cb751f..fc75f71 100644
--- a/recipes/tokendb_updater.expected/dry-run.json
+++ b/recipes/tokendb_updater.expected/dry-run.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1079,7 +1083,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1147,7 +1151,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1197,7 +1201,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-abandon",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_updater.expected/simple.json b/recipes/tokendb_updater.expected/simple.json
index b75c6ce..18c76fe 100644
--- a/recipes/tokendb_updater.expected/simple.json
+++ b/recipes/tokendb_updater.expected/simple.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1079,7 +1083,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1147,7 +1151,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/txt_roller.expected/backwards.json b/recipes/txt_roller.expected/backwards.json
index 36091d1..037f5b4 100644
--- a/recipes/txt_roller.expected/backwards.json
+++ b/recipes/txt_roller.expected/backwards.json
@@ -553,12 +553,19 @@
},
{
"cmd": [],
- "name": "checkout foo.change data.ensure gerrit",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -566,23 +573,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout foo.change data.ensure gerrit.read manifest",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout foo.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -597,10 +601,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout foo.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -610,16 +614,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout foo.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -627,7 +631,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -637,7 +641,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://foo-review.googlesource.com",
diff --git a/recipes/txt_roller.expected/no-trigger.json b/recipes/txt_roller.expected/no-trigger.json
index 7ad8329..5a8155a 100644
--- a/recipes/txt_roller.expected/no-trigger.json
+++ b/recipes/txt_roller.expected/no-trigger.json
@@ -553,12 +553,19 @@
},
{
"cmd": [],
- "name": "checkout foo.change data.ensure gerrit",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -566,23 +573,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout foo.change data.ensure gerrit.read manifest",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout foo.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -597,10 +601,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout foo.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -610,16 +614,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout foo.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout foo.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -627,7 +631,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -637,7 +641,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://foo-review.googlesource.com",
@@ -1504,7 +1508,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1535,7 +1539,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1700,7 +1704,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1770,7 +1774,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/txt_roller.expected/success.json b/recipes/txt_roller.expected/success.json
index f399591..b2bad69 100644
--- a/recipes/txt_roller.expected/success.json
+++ b/recipes/txt_roller.expected/success.json
@@ -878,12 +878,19 @@
},
{
"cmd": [],
- "name": "checkout foo.change data.process gitiles commit.ensure gerrit",
+ "name": "checkout foo.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout foo.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -891,8 +898,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -907,19 +914,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout foo.change data.process gitiles commit.ensure gerrit.read manifest",
+ "name": "checkout foo.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout foo.change data.process gitiles commit.ensure gerrit.install path/to/gerrit",
+ "name": "checkout foo.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -934,7 +938,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -949,7 +953,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout foo.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout foo.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -959,9 +963,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -980,7 +984,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout foo.change data.process gitiles commit.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout foo.change data.process gitiles commit.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -988,7 +992,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -998,7 +1002,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://foo-review.googlesource.com",
@@ -2377,7 +2381,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2420,7 +2424,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2657,7 +2661,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -2763,7 +2767,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/update_python_versions.expected/simple.json b/recipes/update_python_versions.expected/simple.json
index df080d1..10a3ada 100644
--- a/recipes/update_python_versions.expected/simple.json
+++ b/recipes/update_python_versions.expected/simple.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1054,7 +1058,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1122,7 +1126,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index ccd1651..78fa218 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1015,7 +1019,14 @@
},
{
"cmd": [],
- "name": "ensure gsutil"
+ "name": "ensure infra/3pp/tools/gsutil"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/3pp/tools/gsutil.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1025,23 +1036,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gsutil]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "ensure gsutil.read manifest",
+ "name": "ensure infra/3pp/tools/gsutil.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gsutil version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gsutil.install path/to/gsutil",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1056,10 +1064,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version"
],
"infra_step": true,
- "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1069,16 +1077,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version",
"-ensure-file",
- "path/to/gsutil version:pinned-version",
+ "infra/3pp/tools/gsutil version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gsutil.install path/to/gsutil.ensure_installed",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1086,7 +1094,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/gsutil\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1096,7 +1104,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:39.500000Z",
"-o",
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 048a62b..4d2cca7 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -31,12 +31,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -44,23 +51,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -75,10 +79,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -88,16 +92,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,7 +109,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -115,7 +119,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1015,7 +1019,14 @@
},
{
"cmd": [],
- "name": "ensure gsutil"
+ "name": "ensure infra/3pp/tools/gsutil"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/3pp/tools/gsutil.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1025,23 +1036,20 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gsutil]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
- "name": "ensure gsutil.read manifest",
+ "name": "ensure infra/3pp/tools/gsutil.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gsutil version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gsutil.install path/to/gsutil",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1056,10 +1064,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version"
],
"infra_step": true,
- "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1069,16 +1077,16 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version",
"-ensure-file",
- "path/to/gsutil version:pinned-version",
+ "infra/3pp/tools/gsutil version:pinned-version",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure gsutil.install path/to/gsutil.ensure_installed",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1086,7 +1094,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/gsutil\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1096,7 +1104,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:39.500000Z",
"-o",
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index 4bc1764..0ce97b7 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -29,12 +29,19 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
},
{
+ "cmd": [],
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@"
+ ]
+ },
+ {
"cmd": [
"vpython3",
"-u",
@@ -42,8 +49,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -58,19 +65,16 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.read manifest",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@6@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@5@@@"
]
@@ -85,7 +89,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -100,7 +104,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure package directory",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@"
]
@@ -110,9 +114,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version",
"-ensure-file",
- "path/to/gerrit version:pinned-version",
+ "infra/tools/luci/gerrit/${platform} version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -131,7 +135,7 @@
"hostname": "rdbhost"
}
},
- "name": "checkout pigweed.change data.process gerrit changes.0.ensure gerrit.install path/to/gerrit.ensure_installed",
+ "name": "checkout pigweed.change data.process gerrit changes.0.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@6@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -139,7 +143,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gerrit\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -149,7 +153,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -213,7 +217,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -273,7 +277,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
@@ -315,7 +319,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+ "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/version%3Apinned-version/gerrit",
"change-detail",
"-host",
"https://pigweed-review.googlesource.com",
@@ -1881,7 +1885,14 @@
},
{
"cmd": [],
- "name": "ensure gsutil"
+ "name": "ensure infra/3pp/tools/gsutil"
+ },
+ {
+ "cmd": [],
+ "name": "ensure infra/3pp/tools/gsutil.get packages",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1891,8 +1902,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json",
- "/path/to/tmp/json"
+ "RECIPE_MODULE[fuchsia::gsutil]/resources/cipd.ensure",
+ "/path/to/tmp/"
],
"infra_step": true,
"luci_context": {
@@ -1907,19 +1918,16 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gsutil.read manifest",
+ "name": "ensure infra/3pp/tools/gsutil.get packages.read ensure file",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gsutil version:pinned-version@@@",
+ "@@@STEP_LOG_END@cipd.ensure@@@"
]
},
{
"cmd": [],
- "name": "ensure gsutil.install path/to/gsutil",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1934,7 +1942,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version"
],
"infra_step": true,
"luci_context": {
@@ -1949,7 +1957,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -1959,9 +1967,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version",
"-ensure-file",
- "path/to/gsutil version:pinned-version",
+ "infra/3pp/tools/gsutil version:pinned-version",
"-max-threads",
"0",
"-json-output",
@@ -1980,7 +1988,7 @@
"hostname": "rdbhost"
}
},
- "name": "ensure gsutil.install path/to/gsutil.ensure_installed",
+ "name": "ensure infra/3pp/tools/gsutil.install infra/3pp/tools/gsutil.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1988,7 +1996,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/gsutil\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1998,7 +2006,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
+ "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3Apinned-version/gsutil",
"-h",
"Custom-Time:2012-05-14T12:53:39.500000Z",
"-o",
