updated bazel and RBE instance versions

pull/17678/head
Bill Feng 6 years ago
parent 3a59faf632
commit eda9742bbd
  1. 12
      third_party/toolchains/BUILD
  2. 8
      tools/remote_build/rbe_common.bazelrc

@ -20,17 +20,17 @@ package(default_visibility = ["//visibility:public"])
# Update every time when a new container is released. # Update every time when a new container is released.
alias( alias(
name = "rbe_ubuntu1604", name = "rbe_ubuntu1604",
actual = ":rbe_ubuntu1604_r342117", actual = ":rbe_ubuntu1604_r346485",
) )
alias( alias(
name = "rbe_ubuntu1604_large", name = "rbe_ubuntu1604_large",
actual = ":rbe_ubuntu1604_r342117_large", actual = ":rbe_ubuntu1604_r346485_large",
) )
# RBE Ubuntu16_04 r342117 # RBE Ubuntu16_04 r346485
platform( platform(
name = "rbe_ubuntu1604_r342117", name = "rbe_ubuntu1604_r346485",
constraint_values = [ constraint_values = [
"@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:linux", "@bazel_tools//platforms:linux",
@ -51,9 +51,9 @@ platform(
""", """,
) )
# RBE Ubuntu16_04 r342117 large # RBE Ubuntu16_04 r346485 large
platform( platform(
name = "rbe_ubuntu1604_r342117_large", name = "rbe_ubuntu1604_r346485_large",
constraint_values = [ constraint_values = [
"@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:linux", "@bazel_tools//platforms:linux",

@ -18,7 +18,7 @@
startup --host_jvm_args=-Dbazel.DigestFunction=SHA256 startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default:toolchain
build --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-default build --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-default
# Use custom execution platforms defined in third_party/toolchains # Use custom execution platforms defined in third_party/toolchains
build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large
@ -61,9 +61,9 @@ build:msan --cxxopt=--stdlib=libc++
# setting LD_LIBRARY_PATH is necessary # setting LD_LIBRARY_PATH is necessary
# to avoid "libc++.so.1: cannot open shared object file" # to avoid "libc++.so.1: cannot open shared object file"
build:msan --action_env=LD_LIBRARY_PATH=/usr/local/lib build:msan --action_env=LD_LIBRARY_PATH=/usr/local/lib
build:msan --host_crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain build:msan --host_crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default:toolchain
# override the config-agnostic crosstool_top # override the config-agnostic crosstool_top
build:msan --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan:toolchain build:msan --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.20.0/msan:toolchain
# thread sanitizer: most settings are already in %workspace%/.bazelrc # thread sanitizer: most settings are already in %workspace%/.bazelrc
# we only need a few additional ones that are Foundry specific # we only need a few additional ones that are Foundry specific
@ -79,7 +79,7 @@ build:ubsan --copt=-gmlt
# TODO(jtattermusch): use more reasonable test timeout # TODO(jtattermusch): use more reasonable test timeout
build:ubsan --test_timeout=3600 build:ubsan --test_timeout=3600
# override the config-agnostic crosstool_top # override the config-agnostic crosstool_top
--crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan:toolchain --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.1/bazel_0.20.0/ubsan:toolchain
# TODO(jtattermusch): remove this once Foundry adds the env to the docker image. # TODO(jtattermusch): remove this once Foundry adds the env to the docker image.
# ubsan needs symbolizer to work properly, otherwise the suppression file doesn't work # ubsan needs symbolizer to work properly, otherwise the suppression file doesn't work
# and we get test failures. # and we get test failures.

Loading…
Cancel
Save