Clean up unrelated logics belonging to fuchsia.
This is a followup of https://flutter-review.googlesource.com/c/recipes/+/49541.
Change-Id: I341a6c8c70bef7bab2d3550710f824311d8b505a
Bug: https://github.com/flutter/flutter/issues/132701
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/50840
Reviewed-by: Zach Anderson <zra@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/recipe_modules/rbe/api.py b/recipe_modules/rbe/api.py
index 8c114b8..01243ae 100644
--- a/recipe_modules/rbe/api.py
+++ b/recipe_modules/rbe/api.py
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from enum import Enum
from contextlib import contextmanager
from recipe_engine import recipe_api
@@ -19,38 +18,6 @@
"""RemoteExecutionApi contains helper functions for using remote execution
services via re-client/re-proxy."""
- class AbsolutePathPolicy(Enum):
- """This controls how absolute paths are to be treated.
-
- The choice impacts how reproxy and rewrapper are invoked.
-
- Choices:
- REJECT: remote commands using local absolute paths will fail.
- rewrapper --canonicalize_working_dir=true.
- This allows cache sharing between different build output
- directories (under exec_root) at the same depth.
- reproxy: no InputPathAbsoluteRoot
-
- RELATIVIZE: rewrite commands using relative paths, using a wrapper.
- Relative paths are remote-execution friendly, while absolute paths
- will likely fail. cmake builds are known to use absolute paths.
- Relativized commands are better for caching across build
- environments, but the wrapper script incurs some overhead.
- rewrapper --canonicalize_working_dir=true.
- reproxy: no InputPathAbsoluteRoot
-
- ALLOW: Force the remote environment to mimic local paths.
- This allows commands with absolute paths to work,
- at the expense of being able to cache across build environments.
- This option can help cmake builds work remotely.
- rewrapper --canonicalize_working_dir=false.
- reproxy: --platform InputPathAbsoluteRoot=exec_root
- """
-
- REJECT = 1
- RELATIVIZE = 2
- ALLOW = 3
-
def __init__(self, props, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -58,11 +25,6 @@
self._platform = props.platform
self._instance = props.instance
- # Default: let commands that use absolute paths fail remote execution.
- # For best caching performance, restrict remote execution commands
- # to use only relative paths.
- self._absolute_path_policy = self.AbsolutePathPolicy.REJECT
-
if not self._platform and self._test_data.enabled:
self._platform = "fake_rbe_platform"
if not self._instance and self._test_data.enabled:
@@ -76,7 +38,6 @@
reclient_path=None,
config_path=None,
working_path=None,
- absolute_path_policy=AbsolutePathPolicy.REJECT,
):
"""Make context wrapping reproxy start/stop.
@@ -84,10 +45,6 @@
reclient_path (Path): if set, use this Path to reclient tools,
otherwise, automatically use the Path to a loaded CIPD package.
config_path (Path): The config file within the checkout.
- In the case of a Fuchsia checkout, this should be set to the path
- referenced by $FUCHSIA_OUT_DIR/rbe_config.json as reported by
- `gn gen`.
- absolute_path_policy (AbsolutePathPolicy): See enum definition.
Raises:
StepFailure or InfraFailure if it fails to start/stop.
@@ -108,9 +65,6 @@
# conflicts between log/metric files.
working_dir = working_path
- saved_absolute_path_policy = self._absolute_path_policy
- self._absolute_path_policy = absolute_path_policy
-
with self.m.context(env=self._environment(working_dir), infra_steps=True):
try:
self._start(config_path=config_path)
@@ -119,7 +73,6 @@
finally:
if not self.m.runtime.in_global_shutdown:
self._stop(working_dir=working_dir, config_path=config_path)
- self._absolute_path_policy = saved_absolute_path_policy
@property
def _ensure_reclient_path(self):
@@ -136,14 +89,11 @@
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)
- # Environment. The source of truth for remote execution configuration
- # is the Fuchsia tree (see $FUCHSIA_OUT_DIR/rbe_config.json). 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.
+ # 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.
return {
"RBE_service": "remotebuildexecution.googleapis.com:443",
- # TODO(fangism): sync docker image with that used in Fuchsia
"RBE_platform": self._platform,
# Override default instance. Infrastructure uses different RBE
# backends for different environments.
