Support windows rbe server This fixes windows reproxy server start failure: https://ci.chromium.org/ui/p/flutter/builders/try/Windows%20windows_unopt/13868/overview LED run to validate this CL works: https://ci.chromium.org/raw/build/logs.chromium.org/flutter/led/keyonghan_google.com/602066da45923a403dbce034c28b253806fc6f02b57c9e15097c2153125ed95d/+/build.proto?server=chromium-swarm.appspot.com Change-Id: I5de27489e8cf3edff19e812dd0095bc909724a00 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/53880 Reviewed-by: Zach Anderson <zra@google.com> Reviewed-by: Ricardo Amador <ricardoamador@google.com> Commit-Queue: Keyong Han <keyonghan@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 01748b3..914259c 100644 --- a/recipe_modules/build_util/examples/full.expected/basic.json +++ b/recipe_modules/build_util/examples/full.expected/basic.json
@@ -647,7 +647,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -678,7 +678,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -713,7 +713,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -746,7 +746,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -780,7 +780,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -814,7 +814,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -848,7 +848,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -882,7 +882,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -916,7 +916,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -950,7 +950,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -985,7 +985,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipe_modules/build_util/examples/full.expected/mac.json b/recipe_modules/build_util/examples/full.expected/mac.json index c39636b..c96e090 100644 --- a/recipe_modules/build_util/examples/full.expected/mac.json +++ b/recipe_modules/build_util/examples/full.expected/mac.json
@@ -647,7 +647,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -678,7 +678,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -713,7 +713,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -746,7 +746,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -780,7 +780,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -814,7 +814,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -848,7 +848,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -882,7 +882,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -916,7 +916,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -950,7 +950,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -985,7 +985,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipe_modules/rbe/__init__.py b/recipe_modules/rbe/__init__.py index 30b38f2..21b6f95 100644 --- a/recipe_modules/rbe/__init__.py +++ b/recipe_modules/rbe/__init__.py
@@ -11,6 +11,7 @@ "recipe_engine/file", "recipe_engine/json", "recipe_engine/path", + "recipe_engine/platform", "recipe_engine/runtime", "recipe_engine/step", "recipe_engine/time",
diff --git a/recipe_modules/rbe/api.py b/recipe_modules/rbe/api.py index 4f9cdf7..c43d223 100644 --- a/recipe_modules/rbe/api.py +++ b/recipe_modules/rbe/api.py
@@ -91,6 +91,7 @@ cache_dir = self.m.path["cache"].join("rbe") deps_cache_dir = cache_dir.join("deps") self.m.file.ensure_directory("create rbe cache dir", deps_cache_dir) + rbe_server_address = 'pipe://{rbe_working_path}/reproxy.pipe' if self.m.platform.is_win else 'unix://{rbe_working_path}/reproxy.sock' # Environment. These values are used to modify the configuration in # Infrastructure when appropriate. These should not be used to modify # the behavior of the build in a meaningful way. @@ -110,7 +111,7 @@ "RBE_log_dir": working_dir, "RBE_output_dir": working_dir, "RBE_proxy_log_dir": working_dir, - "RBE_server_address": f"unix://{working_dir.join('reproxy.sock')}", + "RBE_server_address": rbe_server_address, "RBE_socket_path": working_dir.join("reproxy.sock"), # Use GCE credentials by default. Infrastructure presents an # emulated GCE metadata server in all environments for uniformity.
diff --git a/recipe_modules/rbe/tests/full.expected/basic.json b/recipe_modules/rbe/tests/full.expected/basic.json index 94c46a2..36449e1 100644 --- a/recipe_modules/rbe/tests/full.expected/basic.json +++ b/recipe_modules/rbe/tests/full.expected/basic.json
@@ -45,7 +45,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -84,7 +84,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -123,7 +123,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -168,7 +168,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -214,7 +214,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -260,7 +260,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -306,7 +306,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -352,7 +352,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -398,7 +398,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -444,7 +444,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -491,7 +491,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -639,7 +639,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -678,7 +678,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -718,7 +718,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -763,7 +763,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -809,7 +809,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -855,7 +855,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -901,7 +901,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -947,7 +947,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -993,7 +993,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1039,7 +1039,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1086,7 +1086,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false",
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 94c46a2..36449e1 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
@@ -45,7 +45,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -84,7 +84,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -123,7 +123,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -168,7 +168,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -214,7 +214,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -260,7 +260,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -306,7 +306,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -352,7 +352,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -398,7 +398,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -444,7 +444,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -491,7 +491,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -639,7 +639,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -678,7 +678,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -718,7 +718,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -763,7 +763,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -809,7 +809,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -855,7 +855,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -901,7 +901,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -947,7 +947,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -993,7 +993,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1039,7 +1039,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1086,7 +1086,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipe_modules/rbe/tests/full.expected/start_rbe_failed.json b/recipe_modules/rbe/tests/full.expected/start_rbe_failed.json index 946c817..805a0f4 100644 --- a/recipe_modules/rbe/tests/full.expected/start_rbe_failed.json +++ b/recipe_modules/rbe/tests/full.expected/start_rbe_failed.json
@@ -36,7 +36,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -68,7 +68,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -101,7 +101,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -135,7 +135,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -169,7 +169,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -203,7 +203,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -237,7 +237,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -271,7 +271,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -305,7 +305,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -340,7 +340,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipe_modules/rbe/tests/full.expected/stop_rbe_failed.json b/recipe_modules/rbe/tests/full.expected/stop_rbe_failed.json index 8bc6767..9a8d4c0 100644 --- a/recipe_modules/rbe/tests/full.expected/stop_rbe_failed.json +++ b/recipe_modules/rbe/tests/full.expected/stop_rbe_failed.json
@@ -33,7 +33,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -60,7 +60,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -90,7 +90,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -124,7 +124,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -158,7 +158,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -192,7 +192,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -226,7 +226,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -260,7 +260,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -294,7 +294,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -328,7 +328,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -363,7 +363,7 @@ "RBE_output_dir": "[CLEANUP]/rbe", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe", - "RBE_server_address": "unix://[CLEANUP]/rbe/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json index b08e135..f8df610 100644 --- a/recipes/engine_v2/builder.expected/basic.json +++ b/recipes/engine_v2/builder.expected/basic.json
@@ -753,7 +753,7 @@ "[CACHE]/builder/src/flutter/tools/gn", "--ios", "--rbe", - "--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "--rbe-server-address=unix://{rbe_working_path}/reproxy.sock" ], "env": { "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", @@ -803,7 +803,7 @@ "hostname": "rdbhost" } }, - "name": "gn --ios --rbe --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "name": "gn --ios --rbe --rbe-server-address=unix://{rbe_working_path}/reproxy.sock" }, { "cmd": [], @@ -1584,7 +1584,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1649,7 +1649,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1719,7 +1719,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1787,7 +1787,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1856,7 +1856,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1925,7 +1925,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1994,7 +1994,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2063,7 +2063,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2132,7 +2132,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2201,7 +2201,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2271,7 +2271,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false",
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 916beaa..de9e010 100644 --- a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json +++ b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
@@ -462,7 +462,7 @@ "--ios", "--rbe", "--no-goma", - "--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "--rbe-server-address=unix://{rbe_working_path}/reproxy.sock" ], "env": { "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", @@ -509,7 +509,7 @@ "hostname": "rdbhost" } }, - "name": "gn --ios --rbe --no-goma --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "name": "gn --ios --rbe --no-goma --rbe-server-address=unix://{rbe_working_path}/reproxy.sock" }, { "cmd": [], @@ -725,7 +725,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -790,7 +790,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -860,7 +860,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -928,7 +928,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -997,7 +997,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1066,7 +1066,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1135,7 +1135,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1204,7 +1204,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1273,7 +1273,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1342,7 +1342,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1412,7 +1412,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json index 6ac7025..f956ac4 100644 --- a/recipes/engine_v2/builder.expected/mac.json +++ b/recipes/engine_v2/builder.expected/mac.json
@@ -1359,7 +1359,7 @@ "[CACHE]/builder/src/flutter/tools/gn", "--ios", "--rbe", - "--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "--rbe-server-address=unix://{rbe_working_path}/reproxy.sock" ], "env": { "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", @@ -1409,7 +1409,7 @@ "hostname": "rdbhost" } }, - "name": "gn --ios --rbe --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "name": "gn --ios --rbe --rbe-server-address=unix://{rbe_working_path}/reproxy.sock" }, { "cmd": [], @@ -2190,7 +2190,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2255,7 +2255,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2325,7 +2325,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2393,7 +2393,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2462,7 +2462,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2531,7 +2531,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2600,7 +2600,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2669,7 +2669,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2738,7 +2738,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2807,7 +2807,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2877,7 +2877,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json index 4f19273..5dae6af 100644 --- a/recipes/engine_v2/builder.expected/monorepo.json +++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -724,7 +724,7 @@ "--ios", "--rbe", "--gn-args=engine_version=\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"", - "--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "--rbe-server-address=unix://{rbe_working_path}/reproxy.sock" ], "env": { "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk", @@ -771,7 +771,7 @@ "hostname": "rdbhost" } }, - "name": "gn --ios --rbe --gn-args=engine_version=\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\" --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "name": "gn --ios --rbe --gn-args=engine_version=\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\" --rbe-server-address=unix://{rbe_working_path}/reproxy.sock" }, { "cmd": [], @@ -1513,7 +1513,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1575,7 +1575,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1642,7 +1642,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1707,7 +1707,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1773,7 +1773,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1839,7 +1839,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1905,7 +1905,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1971,7 +1971,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2037,7 +2037,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2103,7 +2103,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2170,7 +2170,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipes/engine_v2/builder.expected/monorepo_tryjob.json b/recipes/engine_v2/builder.expected/monorepo_tryjob.json index 028b62c..583ad9b 100644 --- a/recipes/engine_v2/builder.expected/monorepo_tryjob.json +++ b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
@@ -811,7 +811,7 @@ "--ios", "--rbe", "--gn-args=engine_version=\"81123491\"", - "--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "--rbe-server-address=unix://{rbe_working_path}/reproxy.sock" ], "env": { "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk", @@ -858,7 +858,7 @@ "hostname": "rdbhost" } }, - "name": "gn --ios --rbe --gn-args=engine_version=\"81123491\" --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock" + "name": "gn --ios --rbe --gn-args=engine_version=\"81123491\" --rbe-server-address=unix://{rbe_working_path}/reproxy.sock" }, { "cmd": [], @@ -1600,7 +1600,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1662,7 +1662,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1729,7 +1729,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1794,7 +1794,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1860,7 +1860,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1926,7 +1926,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -1992,7 +1992,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2058,7 +2058,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2124,7 +2124,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2190,7 +2190,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false", @@ -2257,7 +2257,7 @@ "RBE_output_dir": "[CLEANUP]/rbe_tmp_1", "RBE_platform": "fake_rbe_platform", "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1", - "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock", + "RBE_server_address": "unix://{rbe_working_path}/reproxy.sock", "RBE_service": "remotebuildexecution.googleapis.com:443", "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock", "RBE_use_application_default_credentials": "false",
diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py index 5a120a1..0b2b84a 100644 --- a/recipes/engine_v2/builder.py +++ b/recipes/engine_v2/builder.py
@@ -198,9 +198,8 @@ gn.append(f'--gn-args=engine_version="{version}"') rbe_working_path = api.path.mkdtemp(prefix="rbe") if '--rbe' in gn: - gn.append( - f'--rbe-server-address=unix://{rbe_working_path}/reproxy.sock' - ) + rbe_server_address = 'pipe://{rbe_working_path}/reproxy.pipe' if api.platform.is_win else 'unix://{rbe_working_path}/reproxy.sock' + gn.append(f'--rbe-server-address={rbe_server_address}') api.build_util.run_gn(gn, checkout) ninja = build.get('ninja') ninja_tool[ninja.get('tool', 'ninja')]( @@ -439,9 +438,9 @@ test_if_build = { "tests": [{ "name": "mytest", "script": "myscript.sh", - "parameters": ["param1", "param2", '${FLUTTER_LOGS_DIR}'], - "type": "local", "contexts": ["metric_center_token"], - "test_if": "main" + "parameters": ["param1", "param2", + '${FLUTTER_LOGS_DIR}'], "type": "local", + "contexts": ["metric_center_token"], "test_if": "main" }] } yield api.test(