diff options
| author | Adin Scannell <ascannell@google.com> | 2020-12-30 16:52:06 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-30 16:54:16 -0800 |
| commit | 3b1d37f6ab5ca547020fdd573d3bf6a621313132 (patch) | |
| tree | 96717a788beff87844a59d14d4963a2b8775b4bb /tools/bazeldefs | |
| parent | 4691a8125370d61ccb9732574e97ccc26362af42 (diff) | |
Remove remote execution support.
PiperOrigin-RevId: 349616845
Diffstat (limited to 'tools/bazeldefs')
| -rw-r--r-- | tools/bazeldefs/BUILD | 41 | ||||
| -rw-r--r-- | tools/bazeldefs/defs.bzl | 2 |
2 files changed, 1 insertions, 42 deletions
diff --git a/tools/bazeldefs/BUILD b/tools/bazeldefs/BUILD index 97c7cb45f..a4a605346 100644 --- a/tools/bazeldefs/BUILD +++ b/tools/bazeldefs/BUILD @@ -1,46 +1,7 @@ -load("//tools:defs.bzl", "bzl_library", "rbe_platform", "rbe_toolchain") +load("//tools:defs.bzl", "bzl_library") package(licenses = ["notice"]) -# We need to define a bazel platform and toolchain to specify dockerPrivileged -# and dockerRunAsRoot options, they are required to run tests on the RBE -# cluster in Kokoro. -rbe_platform( - name = "rbe_ubuntu1604", - constraint_values = [ - "@bazel_tools//platforms:x86_64", - "@bazel_tools//platforms:linux", - "@bazel_tools//tools/cpp:clang", - "@bazel_toolchains//constraints:xenial", - "@bazel_toolchains//constraints/sanitizers:support_msan", - ], - remote_execution_properties = """ - properties: { - name: "container-image" - value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:b516a2d69537cb40a7c6a7d92d0008abb29fba8725243772bdaf2c83f1be2272" - } - properties: { - name: "dockerAddCapabilities" - value: "SYS_ADMIN" - } - properties: { - name: "dockerPrivileged" - value: "true" - } - """, -) - -rbe_toolchain( - name = "cc-toolchain-clang-x86_64-default", - exec_compatible_with = [], - tags = [ - "manual", - ], - target_compatible_with = [], - toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.1.0/cc:cc-compiler-k8", - toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", -) - bzl_library( name = "platforms_bzl", srcs = ["platforms.bzl"], diff --git a/tools/bazeldefs/defs.bzl b/tools/bazeldefs/defs.bzl index 279a38fed..58ced5167 100644 --- a/tools/bazeldefs/defs.bzl +++ b/tools/bazeldefs/defs.bzl @@ -5,8 +5,6 @@ load("@bazel_skylib//:bzl_library.bzl", _bzl_library = "bzl_library") build_test = _build_test bzl_library = _bzl_library -rbe_platform = native.platform -rbe_toolchain = native.toolchain more_shards = 4 most_shards = 8 |