Roll reclient to version 185 See https://github.com/flutter/flutter/pull/177293 Change-Id: I00d32ca14085b1f07053e7957c167e62c6707b47 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/71600 Reviewed-by: Zach Anderson <zra@google.com> Commit-Queue: Jason Simmons <jsimmons@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 01d0aed..f31c4ac 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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0" + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55" ], "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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55", "-ensure-file", - "infra/rbe/client/${platform} re_client_version:0.141.1.29a9d3c-gomaip", + "infra/rbe/client/${platform} re_client_version:0.185.0.db415f21-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.141.1.29a9d3c-gomaip\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-re_client_versio\",@@@", "@@@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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap", - "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/reproxy" + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/bootstrap", + "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/reproxy" ], "env": { "RBE_cache_dir": "[CACHE]/rbe/deps", @@ -848,7 +848,7 @@ }, { "cmd": [ - "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/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 59f8a35..c11e584 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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0" + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55" ], "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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55", "-ensure-file", - "infra/rbe/client/${platform} re_client_version:0.141.1.29a9d3c-gomaip", + "infra/rbe/client/${platform} re_client_version:0.185.0.db415f21-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.141.1.29a9d3c-gomaip\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-re_client_versio\",@@@", "@@@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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap", - "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/reproxy" + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/bootstrap", + "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/reproxy" ], "env": { "RBE_cache_dir": "[CACHE]/rbe/deps", @@ -1040,7 +1040,7 @@ }, { "cmd": [ - "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/bootstrap", "--shutdown" ], "env": {
diff --git a/recipe_modules/rbe/api.py b/recipe_modules/rbe/api.py index 5b07976..441b812 100644 --- a/recipe_modules/rbe/api.py +++ b/recipe_modules/rbe/api.py
@@ -14,7 +14,7 @@ # 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' +RBE_VERSION = 're_client_version:0.185.0.db415f21-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 002bc9d..cc6fc73 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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0" + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55" ], "infra_step": true, "luci_context": { @@ -551,9 +551,9 @@ "cipd", "ensure", "-root", - "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55", "-ensure-file", - "infra/rbe/client/${platform} re_client_version:0.141.1.29a9d3c-gomaip", + "infra/rbe/client/${platform} re_client_version:0.185.0.db415f21-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.141.1.29a9d3c-gomaip\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-re_client_versio\",@@@", "@@@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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap", - "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/reproxy", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/bootstrap", + "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/reproxy", "--cfg=[CLEANUP]/configs" ], "env": { @@ -698,7 +698,7 @@ }, { "cmd": [ - "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/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 002bc9d..cc6fc73 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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0" + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55" ], "infra_step": true, "luci_context": { @@ -551,9 +551,9 @@ "cipd", "ensure", "-root", - "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55", "-ensure-file", - "infra/rbe/client/${platform} re_client_version:0.141.1.29a9d3c-gomaip", + "infra/rbe/client/${platform} re_client_version:0.185.0.db415f21-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.141.1.29a9d3c-gomaip\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-re_client_versio\",@@@", "@@@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/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap", - "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/reproxy", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/bootstrap", + "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/reproxy", "--cfg=[CLEANUP]/configs" ], "env": { @@ -698,7 +698,7 @@ }, { "cmd": [ - "[START_DIR]/cipd_tool/infra/rbe/client/f9f7681650dd8789d64b65720b2c5dc56fe11be000f9ae627e7e8b3007ea89f0/bootstrap", + "[START_DIR]/cipd_tool/infra/rbe/client/30c68177fc394853af5ea785e69ee589c61b5bc7aa9d0f68d91926d150837f55/bootstrap", "--shutdown", "--cfg=[CLEANUP]/configs" ],