Roll reclient forward
Change-Id: I0014abf7e99c50cd268eb87948cbddd2c75f6b4d
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/57440
Reviewed-by: Christopher Fujino <fujino@google.com>
Commit-Queue: Zach Anderson <zra@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 1e8865c..f6879ae 100644
--- a/recipe_modules/build_util/examples/full.expected/basic.json
+++ b/recipe_modules/build_util/examples/full.expected/basic.json
@@ -725,7 +725,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0"
],
"infra_step": true,
"name": "install infra/rbe/client.ensure package directory",
@@ -738,9 +738,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0",
"-ensure-file",
- "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
+ "infra/rbe/client/${platform} re_client_version:0.141.1.29a9d3c-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -754,7 +754,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.141.1.29a9d3c-gomaip\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -784,8 +784,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/reproxy"
],
"env": {
"RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -848,7 +848,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/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 4f37f61..6f38404 100644
--- a/recipe_modules/build_util/examples/full.expected/mac.json
+++ b/recipe_modules/build_util/examples/full.expected/mac.json
@@ -725,7 +725,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0"
],
"infra_step": true,
"name": "install infra/rbe/client.ensure package directory",
@@ -738,9 +738,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0",
"-ensure-file",
- "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
+ "infra/rbe/client/${platform} re_client_version:0.141.1.29a9d3c-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -754,7 +754,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.141.1.29a9d3c-gomaip\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -784,8 +784,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy"
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/reproxy"
],
"env": {
"RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1040,7 +1040,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap",
"--shutdown"
],
"env": {
diff --git a/recipe_modules/rbe/api.py b/recipe_modules/rbe/api.py
index 5f3dbdc..192a918 100644
--- a/recipe_modules/rbe/api.py
+++ b/recipe_modules/rbe/api.py
@@ -6,14 +6,15 @@
from recipe_engine import recipe_api
-RECLIENT_CXX_WRAPPER = "reclient-cxx-wrapper.sh"
-
# For builds using the goma input processor, sometimes the deps cache file is
# too big for the default setting. So just set the max file size permitted to
# be large enough.
_DEPS_CACHE_MAX_MB = "512"
-RBE_VERSION = 're_client_version:0.131.1.784ddbb-gomaip'
+# Updated from https://chrome-infra-packages.appspot.com/p/infra/rbe/client
+# and should be kept in sync with the version in the engine DEPS file at
+# https://github.com/flutter/engine/blob/9cb60de37b6d582d886f46b86b90ccb9d6323fea/DEPS#L47
+RBE_VERSION = 're_client_version:0.141.1.29a9d3c-gomaip'
class RbeApi(recipe_api.RecipeApi):
diff --git a/recipe_modules/rbe/tests/full.expected/basic.json b/recipe_modules/rbe/tests/full.expected/basic.json
index 13f22cc..002bc9d 100644
--- a/recipe_modules/rbe/tests/full.expected/basic.json
+++ b/recipe_modules/rbe/tests/full.expected/basic.json
@@ -526,7 +526,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0"
],
"infra_step": true,
"luci_context": {
@@ -551,9 +551,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0",
"-ensure-file",
- "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
+ "infra/rbe/client/${platform} re_client_version:0.141.1.29a9d3c-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -579,7 +579,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.141.1.29a9d3c-gomaip\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -621,8 +621,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/reproxy",
"--cfg=[CLEANUP]/configs"
],
"env": {
@@ -698,7 +698,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/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 13f22cc..002bc9d 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
@@ -526,7 +526,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0"
],
"infra_step": true,
"luci_context": {
@@ -551,9 +551,9 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0",
"-ensure-file",
- "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
+ "infra/rbe/client/${platform} re_client_version:0.141.1.29a9d3c-gomaip",
"-max-threads",
"0",
"-json-output",
@@ -579,7 +579,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"re_client_version:0.141.1.29a9d3c-gomaip\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/rbe/client/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -621,8 +621,8 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
- "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap",
+ "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/reproxy",
"--cfg=[CLEANUP]/configs"
],
"env": {
@@ -698,7 +698,7 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
+ "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap",
"--shutdown",
"--cfg=[CLEANUP]/configs"
],
