Remove ensure tool from rbe module.
This is to unblock the roll of recipe dependencies.
Change-Id: I011225d8412d697e6e05ae5c608e5941c6d66cfd
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/51883
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/build_util/examples/full.expected/basic.json b/recipe_modules/build_util/examples/full.expected/basic.json
index 6cc3d45..7955ffe 100644
--- a/recipe_modules/build_util/examples/full.expected/basic.json
+++ b/recipe_modules/build_util/examples/full.expected/basic.json
@@ -559,36 +559,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -600,12 +571,12 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"infra_step": true,
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -613,24 +584,24 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -659,8 +630,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy"
],
"env": {
"RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -725,7 +696,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown"
],
"env": {
diff --git a/recipe_modules/build_util/examples/full.expected/mac.json b/recipe_modules/build_util/examples/full.expected/mac.json
index 51d9299..c792928 100644
--- a/recipe_modules/build_util/examples/full.expected/mac.json
+++ b/recipe_modules/build_util/examples/full.expected/mac.json
@@ -559,36 +559,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -600,12 +571,12 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"infra_step": true,
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -613,24 +584,24 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -659,8 +630,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy"
],
"env": {
"RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -725,7 +696,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown"
],
"env": {
diff --git a/recipe_modules/build_util/examples/full.expected/win.json b/recipe_modules/build_util/examples/full.expected/win.json
index 39af6b0..1285519 100644
--- a/recipe_modules/build_util/examples/full.expected/win.json
+++ b/recipe_modules/build_util/examples/full.expected/win.json
@@ -570,36 +570,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]\\resources\\tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -611,12 +582,12 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\cipd_tool\\path\\to\\reclient\\version%3Apinned-version"
+ "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"infra_step": true,
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -624,24 +595,24 @@
"cipd.bat",
"ensure",
"-root",
- "[START_DIR]\\cipd_tool\\path\\to\\reclient\\version%3Apinned-version",
+ "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -670,8 +641,8 @@
},
{
"cmd": [
- "[START_DIR]\\cipd_tool\\path\\to\\reclient\\version%3Apinned-version\\bootstrap",
- "--re_proxy=[START_DIR]\\cipd_tool\\path\\to\\reclient\\version%3Apinned-version\\reproxy"
+ "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip\\client\\bootstrap",
+ "--re_proxy=[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip\\client\\reproxy"
],
"env": {
"RBE_cache_dir": "[CACHE]\\rbe\\deps",
@@ -736,7 +707,7 @@
},
{
"cmd": [
- "[START_DIR]\\cipd_tool\\path\\to\\reclient\\version%3Apinned-version\\bootstrap",
+ "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip\\client\\bootstrap",
"--shutdown"
],
"env": {
diff --git a/recipe_modules/gsutil/resources/tool_manifest.json b/recipe_modules/gsutil/resources/tool_manifest.json
deleted file mode 100644
index 6faf032..0000000
--- a/recipe_modules/gsutil/resources/tool_manifest.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "path": "infra/3pp/tools/gsutil",
- "version": "version:2@5.19",
- "do_not_autoroll": true
-}
diff --git a/recipe_modules/rbe/__init__.py b/recipe_modules/rbe/__init__.py
index 6a6a1bb..30b38f2 100644
--- a/recipe_modules/rbe/__init__.py
+++ b/recipe_modules/rbe/__init__.py
@@ -5,8 +5,8 @@
from PB.recipe_modules.flutter.rbe.properties import InputProperties
DEPS = [
- "fuchsia/ensure_tool",
"recipe_engine/buildbucket",
+ "recipe_engine/cipd",
"recipe_engine/context",
"recipe_engine/file",
"recipe_engine/json",
diff --git a/recipe_modules/rbe/api.py b/recipe_modules/rbe/api.py
index 01243ae..0eacca2 100644
--- a/recipe_modules/rbe/api.py
+++ b/recipe_modules/rbe/api.py
@@ -13,6 +13,8 @@
# be large enough.
_DEPS_CACHE_MAX_MB = "512"
+RBE_VERSION = 're_client_version:0.111.0.1ccaa23-gomaip'
+
class RbeApi(recipe_api.RecipeApi):
"""RemoteExecutionApi contains helper functions for using remote execution
@@ -76,9 +78,7 @@
@property
def _ensure_reclient_path(self):
- return self.m.ensure_tool(
- "reclient", self.resource("tool_manifest.json"), executable_path=""
- )
+ return self.m.cipd.ensure_tool('infra/rbe/client/${platform}', RBE_VERSION)
@property
def _bootstrap_path(self):
diff --git a/recipe_modules/rbe/resources/tool_manifest.json b/recipe_modules/rbe/resources/tool_manifest.json
deleted file mode 100644
index a3f9bfe..0000000
--- a/recipe_modules/rbe/resources/tool_manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "path": "infra/rbe/client/${platform}",
- "version": "re_client_version:0.111.0.1ccaa23-gomaip"
-}
\ No newline at end of file
diff --git a/recipe_modules/rbe/tests/full.expected/basic.json b/recipe_modules/rbe/tests/full.expected/basic.json
index d38eca2..540167f 100644
--- a/recipe_modules/rbe/tests/full.expected/basic.json
+++ b/recipe_modules/rbe/tests/full.expected/basic.json
@@ -518,48 +518,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "test:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -571,7 +530,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"infra_step": true,
"luci_context": {
@@ -586,9 +545,9 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -596,9 +555,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -617,15 +576,15 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -666,8 +625,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy",
"--cfg=[CLEANUP]/configs"
],
"env": {
@@ -745,7 +704,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown",
"--cfg=[CLEANUP]/configs"
],
diff --git a/recipe_modules/rbe/tests/full.expected/read_log_proto_failure_does_not_block.json b/recipe_modules/rbe/tests/full.expected/read_log_proto_failure_does_not_block.json
index d38eca2..540167f 100644
--- a/recipe_modules/rbe/tests/full.expected/read_log_proto_failure_does_not_block.json
+++ b/recipe_modules/rbe/tests/full.expected/read_log_proto_failure_does_not_block.json
@@ -518,48 +518,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "test:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -571,7 +530,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"infra_step": true,
"luci_context": {
@@ -586,9 +545,9 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -596,9 +555,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -617,15 +576,15 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -666,8 +625,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy",
"--cfg=[CLEANUP]/configs"
],
"env": {
@@ -745,7 +704,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown",
"--cfg=[CLEANUP]/configs"
],
diff --git a/recipe_modules/tar/resources/tool_manifest.json b/recipe_modules/tar/resources/tool_manifest.json
deleted file mode 100644
index b935e19..0000000
--- a/recipe_modules/tar/resources/tool_manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "path": "fuchsia/tools/bsdtar/${platform}",
- "version": "git_revision:6462ccda48c8f33dce4c80c2f1533263277d4da9"
-}
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 0ad183f..b43ff94 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json
@@ -1237,69 +1237,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_CLEANUP": "[CLEANUP]",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -1311,7 +1249,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1347,9 +1285,9 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1357,9 +1295,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -1399,15 +1337,15 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1469,8 +1407,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1596,7 +1534,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown"
],
"env": {
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
index 8cfca1d..3a04f22 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
@@ -442,69 +442,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_CLEANUP": "[CLEANUP]",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -516,7 +454,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -552,9 +490,9 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -562,9 +500,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -604,15 +542,15 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -674,8 +612,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -801,7 +739,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown"
],
"env": {
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 6742eaf..0867fa5 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -1591,69 +1591,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_CLEANUP": "[CLEANUP]",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "darwin",
- "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -1665,7 +1603,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1701,9 +1639,9 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1711,9 +1649,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -1753,15 +1691,15 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1823,8 +1761,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1950,7 +1888,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown"
],
"env": {
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index 0fec223..5f7f1a4 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -1212,68 +1212,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
- "ENGINE_PATH": "[CACHE]/builder/engine",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -1285,7 +1224,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1320,9 +1259,9 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1330,9 +1269,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -1371,15 +1310,15 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1440,8 +1379,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1565,7 +1504,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown"
],
"env": {
diff --git a/recipes/engine_v2/builder.expected/monorepo_tryjob.json b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
index 58689bd..6ab7694 100644
--- a/recipes/engine_v2/builder.expected/monorepo_tryjob.json
+++ b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
@@ -1299,68 +1299,7 @@
},
{
"cmd": [],
- "name": "ensure reclient"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[flutter::rbe]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
- "ENGINE_PATH": "[CACHE]/builder/engine",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "ensure reclient.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/reclient\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure reclient.install path/to/reclient",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install infra/rbe/client"
},
{
"cmd": [
@@ -1372,7 +1311,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1407,9 +1346,9 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure package directory",
+ "name": "install infra/rbe/client.ensure package directory",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1417,9 +1356,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
"-ensure-file",
- "path/to/reclient version:pinned-version",
+ "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -1458,15 +1397,15 @@
"hostname": "rdbhost"
}
},
- "name": "ensure reclient.install path/to/reclient.ensure_installed",
+ "name": "install infra/rbe/client.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/reclient\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.111.0.1ccaa23-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -1527,8 +1466,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/reproxy"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1652,7 +1591,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/path/to/reclient/version%3Apinned-version/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/client/bootstrap",
"--shutdown"
],
"env": {
