Update RBE configuration
Added RBE parameters to bazelrc, that will be needed once this version of Bazel is released. (RBE via bazel-toolchains is running using latest release bazel, in this case 3.7.2).
I updated bazel-toolchains repo, because it contains modifications that will be needed - detection of java version and generation of toolchains that are compatible with toolchain resolution.
I removed dummy_toolchain_reference, because the bug has apparently been fixed, and all tests pass without the workaround.
I removed special casing using EXECUTOR=remote for ijar and singlejar. This works with older version of Bazel on RBE, because execution constraints (os:windows/linux, cpu) were already properly detected.
Closes #12853.
PiperOrigin-RevId: 352574661
diff --git a/.bazelrc b/.bazelrc
index 10a5a1f..5308feb 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -9,14 +9,13 @@
build:remote_shared --jobs=100
build:remote_shared --action_env=PATH=/bin:/usr/bin:/usr/local/bin
build:remote_shared --disk_cache=
+build:remote_shared --java_runtime_version=rbe_jdk
+build:remote_shared --tool_java_runtime_version=rbe_jdk
# Workaround for singlejar incompatibility with RBE
build:remote_shared --noexperimental_check_desugar_deps
# Configuration to build and test Bazel on RBE on Ubuntu 18.04 with Java 11
-build:ubuntu1804_java11 --host_javabase=@rbe_ubuntu1804_java11//java:jdk
-build:ubuntu1804_java11 --javabase=@rbe_ubuntu1804_java11//java:jdk
-build:ubuntu1804_java11 --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java9
-build:ubuntu1804_java11 --java_toolchain=@bazel_tools//tools/jdk:toolchain_java9
+build:ubuntu1804_java11 --extra_toolchains=@rbe_ubuntu1804_java11//java:all
build:ubuntu1804_java11 --crosstool_top=@rbe_ubuntu1804_java11//cc:toolchain
build:ubuntu1804_java11 --extra_toolchains=@rbe_ubuntu1804_java11//config:cc-toolchain
build:ubuntu1804_java11 --extra_execution_platforms=//:rbe_ubuntu1804_java11_platform
@@ -26,10 +25,7 @@
build:ubuntu1804_java11 --config=remote_shared
# Configuration to build and test Bazel on RBE on Ubuntu 16.04 with Java 8
-build:ubuntu1604_java8 --host_javabase=@rbe_ubuntu1604_java8//java:jdk
-build:ubuntu1604_java8 --javabase=@rbe_ubuntu1604_java8//java:jdk
-build:ubuntu1604_java8 --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
-build:ubuntu1604_java8 --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:ubuntu1604_java8 --extra_toolchains=@rbe_ubuntu1604_java8//java:all
build:ubuntu1604_java8 --crosstool_top=@rbe_ubuntu1604_java8//cc:toolchain
build:ubuntu1604_java8 --extra_toolchains=@rbe_ubuntu1604_java8//config:cc-toolchain
build:ubuntu1604_java8 --extra_execution_platforms=//:rbe_ubuntu1604_java8_platform
@@ -38,6 +34,16 @@
build:ubuntu1604_java8 --platforms=//:rbe_ubuntu1604_java8_platform
build:ubuntu1604_java8 --config=remote_shared
+#TODO(ilist): remove once Bazel version on RBE is > 4.0.0
+build:ubuntu1804_java11 --host_javabase=@rbe_ubuntu1804_java11//java:jdk
+build:ubuntu1804_java11 --javabase=@rbe_ubuntu1804_java11//java:jdk
+build:ubuntu1804_java11 --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java9
+build:ubuntu1804_java11 --java_toolchain=@bazel_tools//tools/jdk:toolchain_java9
+build:ubuntu1604_java8 --host_javabase=@rbe_ubuntu1604_java8//java:jdk
+build:ubuntu1604_java8 --javabase=@rbe_ubuntu1604_java8//java:jdk
+build:ubuntu1604_java8 --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:ubuntu1604_java8 --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+
# Alias
build:remote --config=ubuntu1604_java8
