summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.bazelrc16
-rw-r--r--tools/remote-bazelrc14
2 files changed, 19 insertions, 11 deletions
diff --git a/.bazelrc b/.bazelrc
index 501ade1d7a..fb116b93ad 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -17,10 +17,13 @@ build --java_runtime_version=remotejdk_11
build --tool_java_language_version=11
build --tool_java_runtime_version=remotejdk_11
-# Builds and executes on RBE using remotejdk_11
-build:remote --config=remote_shared
+# Builds and executes on Google GCP RBE using remotejdk_11
+build:remote --config=config_gcp
build:remote --config=build_shared
+# Define remote configuration alias
+build:remote_gcp --config=remote
+
# Define configuration using remotejdk_17, executes using remotejdk_17 or local_jdk
build:build_java17_shared --java_language_version=17
build:build_java17_shared --java_runtime_version=remotejdk_17
@@ -29,9 +32,12 @@ build:build_java17_shared --tool_java_runtime_version=remotejdk_17
build:java17 --config=build_java17_shared
-# Builds and executes on RBE using remotejdk_17
-build:remote17 --config=remote_shared
-build:remote17 --config=build_java11_shared
+# Builds and executes on Google GCP RBE using remotejdk_17
+build:remote17 --config=config_gcp
+build:remote17 --config=build_java17_shared
+
+# Define remote17 configuration alias
+build:remote17_gcp --config=remote17
# Enable strict_action_env flag to. For more information on this feature see
# https://groups.google.com/forum/#!topic/bazel-discuss/_VmRfMyyHBk.
diff --git a/tools/remote-bazelrc b/tools/remote-bazelrc
index 37688079a5..417b2e8758 100644
--- a/tools/remote-bazelrc
+++ b/tools/remote-bazelrc
@@ -43,17 +43,19 @@ build:remote_shared --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
# machine exactly match the host machine.
build:remote_shared --define=EXECUTOR=remote
+# Set a higher timeout value, just in case.
+build:remote_shared --remote_timeout=3600
+
+# Configuration flags for remote settings in Google GCP RBE
# Enable the remote cache so action results can be shared across machines,
# developers, and workspaces.
-build:remote_shared --remote_cache=remotebuildexecution.googleapis.com
+build:config_gcp --remote_cache=remotebuildexecution.googleapis.com
# Enable remote execution so actions are performed on the remote systems.
-build:remote_shared --remote_executor=remotebuildexecution.googleapis.com
-
-# Set a higher timeout value, just in case.
-build:remote_shared --remote_timeout=3600
+build:config_gcp --remote_executor=remotebuildexecution.googleapis.com
# Enable authentication. This will pick up application default credentials by
# default. You can use --auth_credentials=some_file.json to use a service
# account credential instead.
-build:remote_shared --google_default_credentials
+build:config_gcp --google_default_credentials
+build:config_gcp --config=remote_shared