diff options
| author |  philwo <philwo@google.com> | 2018-07-31 08:36:47 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-31 08:38:19 -0700 |
| commit | faef18003ccc6568f6bd3d6eebbf0dd5f4247dcd (patch) | |
| tree | 239719ad7d5fcb1c80971165aeb671f3a305c785 /src/test/shell | |
| parent | 76b7960843b71619c59565cfe7dc642cef7db4c3 (diff) | |
Fix bazel_docker_sandboxing_test by updating it to use the latest bazel-toolchains.
RELNOTES: None.
PiperOrigin-RevId: 206766616
Diffstat (limited to 'src/test/shell')
| -rwxr-xr-x | src/test/shell/bazel/bazel_docker_sandboxing_test.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/test/shell/bazel/bazel_docker_sandboxing_test.sh b/src/test/shell/bazel/bazel_docker_sandboxing_test.sh index c585bebb5a..cec98195f3 100755 --- a/src/test/shell/bazel/bazel_docker_sandboxing_test.sh +++ b/src/test/shell/bazel/bazel_docker_sandboxing_test.sh @@ -26,11 +26,23 @@ source $(rlocation io_bazel/src/test/shell/integration_test_setup.sh) \ function test_build_bazel_using_docker() { unzip -qo "${DISTFILE}" &> $TEST_log || fail "Could not unzip Bazel's distfile" + # The first set of flags comes from the instructions on the bazel-toolchains + # website: https://releases.bazel.build/bazel-toolchains.html + # + # The second set of flags enables the Docker sandbox in Bazel. bazel build \ - --host_javabase=@bazel_toolchains//configs/debian8_clang/0.3.0:jdk8 \ - --javabase=@bazel_toolchains//configs/debian8_clang/0.3.0:jdk8 \ - --crosstool_top=@bazel_toolchains//configs/debian8_clang/0.3.0/bazel_0.10.0:toolchain \ - --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://gcr.io/cloud-marketplace/google/rbe-debian8@sha256:1ede2a929b44d629ec5abe86eee6d7ffea1d5a4d247489a8867d46cfde3e38bd" }' \ + --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:jdk8 \ + --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:jdk8 \ + --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 \ + --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 \ + --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.0/bazel_0.15.0/default:toolchain \ + --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 \ + --extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/1.0/bazel_0.15.0/cpp:cc-toolchain-clang-x86_64-default \ + --extra_execution_platforms=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:rbe_ubuntu1604 \ + --host_platform=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:rbe_ubuntu1604 \ + --platforms=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:rbe_ubuntu1604 \ + \ + --experimental_enable_docker_sandbox --experimental_docker_verbose \ --spawn_strategy=docker --strategy=Javac=docker --genrule_strategy=sandboxed \ --define=EXECUTOR=remote \ //src:bazel \ |