diff options
| -rw-r--r-- | .bazelrc | 8 | ||||
| -rw-r--r-- | BUILD | 61 | ||||
| -rw-r--r-- | WORKSPACE | 14 | ||||
| -rw-r--r-- | benchmarks/BUILD | 1 | ||||
| -rw-r--r-- | tools/bazeldefs/BUILD | 41 | ||||
| -rw-r--r-- | tools/bazeldefs/defs.bzl | 9 | ||||
| -rw-r--r-- | tools/defs.bzl | 7 |
7 files changed, 88 insertions, 53 deletions
@@ -30,10 +30,10 @@ build:remote --auth_scope="https://www.googleapis.com/auth/cloud-source-tools" # Add a custom platform and toolchain that builds in a privileged docker # container, which is required by our syscall tests. -build:remote --host_platform=//:rbe_ubuntu1604 -build:remote --extra_toolchains=//:cc-toolchain-clang-x86_64-default -build:remote --extra_execution_platforms=//:rbe_ubuntu1604 -build:remote --platforms=//:rbe_ubuntu1604 +build:remote --host_platform=//tools/bazeldefs:rbe_ubuntu1604 +build:remote --extra_toolchains=//tools/bazeldefs:cc-toolchain-clang-x86_64-default +build:remote --extra_execution_platforms=//tools/bazeldefs:rbe_ubuntu1604 +build:remote --platforms=//tools/bazeldefs:rbe_ubuntu1604 build:remote --crosstool_top=@rbe_default//cc:toolchain build:remote --jobs=50 build:remote --remote_timeout=3600 @@ -1,13 +1,23 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_path", "nogo") -load("@bazel_gazelle//:def.bzl", "gazelle") +load("//tools:defs.bzl", "build_test", "gazelle", "go_path") package(licenses = ["notice"]) +exports_files(["LICENSE"]) + # The sandbox filegroup is used for sandbox-internal dependencies. package_group( name = "sandbox", - packages = [ - "//...", + packages = ["//..."], +) + +# For targets that will not normally build internally, we ensure that they are +# least build by a static BUILD test. +build_test( + name = "build_test", + targets = [ + "//test/e2e:integration_test", + "//test/image:image_test", + "//test/root:root_test", ], ) @@ -43,46 +53,3 @@ go_path( # To update the WORKSPACE from go.mod, use: # bazel run //:gazelle -- update-repos -from_file=go.mod gazelle(name = "gazelle") - -# 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. -alias( - name = "rbe_ubuntu1604", - actual = ":rbe_ubuntu1604_r346485", -) - -platform( - name = "rbe_ubuntu1604_r346485", - 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:93f7e127196b9b653d39830c50f8b05d49ef6fd8739a9b5b8ab16e1df5399e50" - } - properties: { - name: "dockerAddCapabilities" - value: "SYS_ADMIN" - } - properties: { - name: "dockerPrivileged" - value: "true" - } - """, -) - -toolchain( - name = "cc-toolchain-clang-x86_64-default", - exec_compatible_with = [ - ], - target_compatible_with = [ - ], - toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_2.0.0/cc:cc-compiler-k8", - toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", -) @@ -1,6 +1,20 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") +# Bazel/starlark utilities. +http_archive( + name = "bazel_skylib", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz", + ], + sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44", +) + +load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") + +bazel_skylib_workspace() + # Load go bazel rules and gazelle. # # Note that this repository actually patches some other Go repositories as it diff --git a/benchmarks/BUILD b/benchmarks/BUILD index ac44f479d..389351210 100644 --- a/benchmarks/BUILD +++ b/benchmarks/BUILD @@ -9,6 +9,7 @@ config_setting( py_binary( name = "benchmarks", + testonly = 1, srcs = ["run.py"], data = select({ ":gcloud_rule": [], diff --git a/tools/bazeldefs/BUILD b/tools/bazeldefs/BUILD index 00a467473..f2f80bae1 100644 --- a/tools/bazeldefs/BUILD +++ b/tools/bazeldefs/BUILD @@ -1,3 +1,5 @@ +load("//tools:defs.bzl", "rbe_platform", "rbe_toolchain") + package(licenses = ["notice"]) # In bazel, no special support is required for loopback networking. This is @@ -8,3 +10,42 @@ genrule( cmd = "touch $@", visibility = ["//:sandbox"], ) + +# 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:93f7e127196b9b653d39830c50f8b05d49ef6fd8739a9b5b8ab16e1df5399e50" + } + 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/10.0.0/bazel_2.0.0/cc:cc-compiler-k8", + toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", +) diff --git a/tools/bazeldefs/defs.bzl b/tools/bazeldefs/defs.bzl index 3c22aec24..1a8c1d23b 100644 --- a/tools/bazeldefs/defs.bzl +++ b/tools/bazeldefs/defs.bzl @@ -1,19 +1,24 @@ """Bazel implementations of standard rules.""" +load("@bazel_gazelle//:def.bzl", _gazelle = "gazelle") +load("@bazel_skylib//rules:build_test.bzl", _build_test = "build_test") load("@bazel_tools//tools/cpp:cc_flags_supplier.bzl", _cc_flags_supplier = "cc_flags_supplier") -load("@io_bazel_rules_go//go:def.bzl", "GoLibrary", _go_binary = "go_binary", _go_context = "go_context", _go_embed_data = "go_embed_data", _go_library = "go_library", _go_test = "go_test") +load("@io_bazel_rules_go//go:def.bzl", "GoLibrary", _go_binary = "go_binary", _go_context = "go_context", _go_embed_data = "go_embed_data", _go_library = "go_library", _go_path = "go_path", _go_test = "go_test") load("@io_bazel_rules_go//proto:def.bzl", _go_grpc_library = "go_grpc_library", _go_proto_library = "go_proto_library") load("@rules_cc//cc:defs.bzl", _cc_binary = "cc_binary", _cc_library = "cc_library", _cc_proto_library = "cc_proto_library", _cc_test = "cc_test") load("@rules_pkg//:pkg.bzl", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar") load("@pydeps//:requirements.bzl", _py_requirement = "requirement") load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", _cc_grpc_library = "cc_grpc_library") +build_test = _build_test cc_library = _cc_library cc_flags_supplier = _cc_flags_supplier cc_proto_library = _cc_proto_library cc_test = _cc_test cc_toolchain = "@bazel_tools//tools/cpp:current_cc_toolchain" +gazelle = _gazelle go_embed_data = _go_embed_data +go_path = _go_path gtest = "@com_google_googletest//:gtest" grpcpp = "@com_github_grpc_grpc//:grpc++" gbenchmark = "@com_google_benchmark//:benchmark" @@ -23,6 +28,8 @@ pkg_tar = _pkg_tar py_library = native.py_library py_binary = native.py_binary py_test = native.py_test +rbe_platform = native.platform +rbe_toolchain = native.toolchain def proto_library(name, has_services = None, **kwargs): native.proto_library( diff --git a/tools/defs.bzl b/tools/defs.bzl index cdaf281f3..fb9fd4bae 100644 --- a/tools/defs.bzl +++ b/tools/defs.bzl @@ -7,12 +7,13 @@ change for Google-internal and bazel-compatible rules. load("//tools/go_stateify:defs.bzl", "go_stateify") load("//tools/go_marshal:defs.bzl", "go_marshal", "marshal_deps", "marshal_test_deps") -load("//tools/bazeldefs:defs.bzl", _cc_binary = "cc_binary", _cc_flags_supplier = "cc_flags_supplier", _cc_grpc_library = "cc_grpc_library", _cc_library = "cc_library", _cc_proto_library = "cc_proto_library", _cc_test = "cc_test", _cc_toolchain = "cc_toolchain", _default_installer = "default_installer", _default_net_util = "default_net_util", _gbenchmark = "gbenchmark", _go_binary = "go_binary", _go_embed_data = "go_embed_data", _go_grpc_and_proto_libraries = "go_grpc_and_proto_libraries", _go_library = "go_library", _go_proto_library = "go_proto_library", _go_test = "go_test", _grpcpp = "grpcpp", _gtest = "gtest", _loopback = "loopback", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar", _proto_library = "proto_library", _py_binary = "py_binary", _py_library = "py_library", _py_requirement = "py_requirement", _py_test = "py_test", _select_arch = "select_arch", _select_system = "select_system") +load("//tools/bazeldefs:defs.bzl", _build_test = "build_test", _cc_binary = "cc_binary", _cc_flags_supplier = "cc_flags_supplier", _cc_grpc_library = "cc_grpc_library", _cc_library = "cc_library", _cc_proto_library = "cc_proto_library", _cc_test = "cc_test", _cc_toolchain = "cc_toolchain", _default_installer = "default_installer", _default_net_util = "default_net_util", _gazelle = "gazelle", _gbenchmark = "gbenchmark", _go_binary = "go_binary", _go_embed_data = "go_embed_data", _go_grpc_and_proto_libraries = "go_grpc_and_proto_libraries", _go_library = "go_library", _go_path = "go_path", _go_proto_library = "go_proto_library", _go_test = "go_test", _grpcpp = "grpcpp", _gtest = "gtest", _loopback = "loopback", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar", _proto_library = "proto_library", _py_binary = "py_binary", _py_library = "py_library", _py_requirement = "py_requirement", _py_test = "py_test", _rbe_platform = "rbe_platform", _rbe_toolchain = "rbe_toolchain", _select_arch = "select_arch", _select_system = "select_system") load("//tools/bazeldefs:platforms.bzl", _default_platform = "default_platform", _platforms = "platforms") load("//tools/bazeldefs:tags.bzl", "go_suffixes") load("//tools/nogo:defs.bzl", "nogo_test") # Delegate directly. +build_test = _build_test cc_binary = _cc_binary cc_flags_supplier = _cc_flags_supplier cc_grpc_library = _cc_grpc_library @@ -22,7 +23,9 @@ cc_toolchain = _cc_toolchain default_installer = _default_installer default_net_util = _default_net_util gbenchmark = _gbenchmark +gazelle = _gazelle go_embed_data = _go_embed_data +go_path = _go_path go_test = _go_test gtest = _gtest grpcpp = _grpcpp @@ -35,6 +38,8 @@ py_requirement = _py_requirement py_test = _py_test select_arch = _select_arch select_system = _select_system +rbe_platform = _rbe_platform +rbe_toolchain = _rbe_toolchain # Platform options. default_platform = _default_platform |