From 92068f481c7468d0b6d6633a053eb6df34e65cc6 Mon Sep 17 00:00:00 2001
From: Philip Kuryloski <kuryloskip@vmware.com>
Date: Wed, 10 Nov 2021 15:04:45 +0100
Subject: Use externailzed rbe config in bazel

---
 .bazelrc | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

(limited to '.bazelrc')

diff --git a/.bazelrc b/.bazelrc
index af4ae18855..5b11a54475 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -14,38 +14,25 @@ build:rbe --config=buildbuddy
 
 build:rbe --remote_executor=grpcs://remote.buildbuddy.io
 
-build:rbe --crosstool_top=@buildbuddy_toolchain//:toolchain
-build:rbe --extra_toolchains=@buildbuddy_toolchain//:cc_toolchain
-build:rbe --javabase=@buildbuddy_toolchain//:javabase_jdk8
-build:rbe --host_javabase=@buildbuddy_toolchain//:javabase_jdk8
-build:rbe --java_toolchain=@buildbuddy_toolchain//:toolchain_jdk8
-build:rbe --host_java_toolchain=@buildbuddy_toolchain//:toolchain_jdk8
-
+build:rbe --host_javabase=@rbe_default//java:jdk
+build:rbe --javabase=@rbe_default//java:jdk
+build:rbe --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:rbe --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:rbe --crosstool_top=@rbe_default//cc:toolchain
+build:rbe --extra_toolchains=@rbe_default//config:cc-toolchain
+build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+
+build:rbe --host_platform=@rbe_default//config:platform
+build:rbe --platforms=@rbe_default//config:platform
+build:rbe --extra_execution_platforms=@rbe_default//config:platform
+
+build:rbe --@bazel-erlang//:erlang_version=24
 build:rbe --@bazel-erlang//:erlang_home=/usr/lib/erlang
 build:rbe --//:elixir_home=/usr/local
 
 build:rbe --spawn_strategy=remote
 build:rbe --test_strategy=""
-build:rbe --jobs=50
-
-build:rbe-23 --config=rbe
-build:rbe-23 --host_platform=//:erlang_23_platform
-build:rbe-23 --platforms=//:erlang_23_platform
-build:rbe-23 --extra_execution_platforms=//:erlang_23_platform
-build:rbe-23 --@bazel-erlang//:erlang_version=23
-
-build:rbe-24 --config=rbe
-build:rbe-24 --host_platform=//:erlang_24_platform
-build:rbe-24 --platforms=//:erlang_24_platform
-build:rbe-24 --extra_execution_platforms=//:erlang_24_platform
-build:rbe-24 --@bazel-erlang//:erlang_version=24
-
-build:rbe-git --config=rbe
-build:rbe-git --host_platform=//:erlang_git_platform
-build:rbe-git --platforms=//:erlang_git_platform
-build:rbe-git --extra_execution_platforms=//:erlang_git_platform
-build:rbe-git --@bazel-erlang//:erlang_home=/usr/local/lib/erlang
-build:rbe-git --@bazel-erlang//:erlang_version=25
+build:rbe --jobs=100
 
 # Try importing a user specific .bazelrc
 # You can create your own by copying and editing the template-user.bazelrc template:
-- 
cgit v1.2.1