From 9759a1b241c11203f6630634d8cb3e38aefd8aaa Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Wed, 7 Nov 2018 15:21:04 -0800 Subject: removed accidental submodule update --- bazel/grpc_build_system.bzl | 3 +- test/core/gpr/BUILD | 2 +- test/core/iomgr/BUILD | 2 +- test/cpp/qps/BUILD | 2 +- third_party/toolchains/BUILD | 37 ++++++++++++++++++----- third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE | 1 - third_party/toolchains/machine_size/BUILD | 31 +++++++++++++++++++ tools/remote_build/rbe_common.bazelrc | 4 +-- 8 files changed, 68 insertions(+), 14 deletions(-) delete mode 100644 third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE create mode 100644 third_party/toolchains/machine_size/BUILD diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 159ebd5d1f..22c77e468f 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -131,7 +131,7 @@ def grpc_proto_library( generate_mocks = generate_mocks, ) -def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium", timeout = "moderate", tags = []): +def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium", timeout = "moderate", tags = [], exec_compatible_with = []): copts = [] if language.upper() == "C": copts = if_not_windows(["-std=c99"]) @@ -145,6 +145,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data "linkopts": if_not_windows(["-pthread"]), "size": size, "timeout": timeout, + "exec_compatible_with": exec_compatible_with, } if uses_polling: native.cc_test(testonly = True, tags = ["manual"], **args) diff --git a/test/core/gpr/BUILD b/test/core/gpr/BUILD index d58d4f2a14..67657ee1ce 100644 --- a/test/core/gpr/BUILD +++ b/test/core/gpr/BUILD @@ -81,12 +81,12 @@ grpc_cc_test( grpc_cc_test( name = "mpscq_test", srcs = ["mpscq_test.cc"], + exec_compatible_with = ["//third_party/toolchains/machine_size:large"], language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", ], - data = ["//third_party/toolchains:RBE_USE_MACHINE_TYPE_LARGE"], ) grpc_cc_test( diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 70ee83acd2..e278632e50 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -40,7 +40,7 @@ grpc_cc_library( grpc_cc_test( name = "combiner_test", srcs = ["combiner_test.cc"], - data = ["//third_party/toolchains:RBE_USE_MACHINE_TYPE_LARGE"], + exec_compatible_with = ["//third_party/toolchains/machine_size:large"], language = "C++", deps = [ "//:gpr", diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 26f43284a6..626ac5f3f2 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -170,7 +170,7 @@ grpc_cc_test( grpc_cc_test( name = "qps_openloop_test", srcs = ["qps_openloop_test.cc"], - data = ["//third_party/toolchains:RBE_USE_MACHINE_TYPE_LARGE"], + exec_compatible_with = ["//third_party/toolchains/machine_size:large"], deps = [ ":benchmark_config", ":driver_impl", diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 02cd87a7b9..efb52736fe 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -16,36 +16,59 @@ licenses(["notice"]) # Apache v2 package(default_visibility = ["//visibility:public"]) -exports_files(["RBE_USE_MACHINE_TYPE_LARGE",]) - # Latest RBE Ubuntu16_04 container # Update every time when a new container is released. alias( name = "rbe_ubuntu1604", - actual = ":rbe_ubuntu1604_r328903", + actual = ":rbe_ubuntu1604_r340178", ) -# RBE Ubuntu16_04 r328903 +alias( + name = "rbe_ubuntu1604_large", + actual = ":rbe_ubuntu1604_r340178_large", +) + +# RBE Ubuntu16_04 r340178 platform( - name = "rbe_ubuntu1604_r328903", + name = "rbe_ubuntu1604_r340178", constraint_values = [ "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", "@bazel_tools//tools/cpp:clang", "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", + "//third_party/toolchains/machine_size:standard", ], remote_execution_properties = """ properties: { name: "container-image" - value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:59bf0e191a6b5cc1ab62c2224c810681d1326bad5a27b1d36c9f40113e79da7f" + value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:9bd8ba020af33edb5f11eff0af2f63b3bcb168cd6566d7b27c6685e717787928" } properties: { name: "gceMachineType" # Small machines for majority of tests. value: "n1-highmem-2" } + """, +) + +# RBE Ubuntu16_04 r340178 large +platform( + name = "rbe_ubuntu1604_r340178_large", + constraint_values = [ + "@bazel_tools//platforms:x86_64", + "@bazel_tools//platforms:linux", + "@bazel_tools//tools/cpp:clang", + "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", + "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", + "//third_party/toolchains/machine_size:large", + ], + remote_execution_properties = """ + properties: { + name: "container-image" + value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:9bd8ba020af33edb5f11eff0af2f63b3bcb168cd6566d7b27c6685e717787928" + } properties: { - name: "gceMachineType_LARGE" # Large machines for a small set of resource-consuming tests such as combiner_tests under TSAN. + name: "gceMachineType" # Small machines for majority of tests. value: "n1-standard-8" } """, diff --git a/third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE b/third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE deleted file mode 100644 index b1120238d7..0000000000 --- a/third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE +++ /dev/null @@ -1 +0,0 @@ -# This file is a sentinel and is meant to be empty. diff --git a/third_party/toolchains/machine_size/BUILD b/third_party/toolchains/machine_size/BUILD new file mode 100644 index 0000000000..cc962946c3 --- /dev/null +++ b/third_party/toolchains/machine_size/BUILD @@ -0,0 +1,31 @@ +# Copyright 2018 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +licenses(["notice"]) # Apache v2 + +package(default_visibility = ["//visibility:public"]) + +constraint_setting(name = "machine_size") + +constraint_value( + name = "large", + constraint_setting = ":machine_size", +) + +constraint_value( + name = "standard", + constraint_setting = ":machine_size", +) + +# Add other constraint values as needed (tiny, huge, etc.) in the future. diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index e8c7f0b9cb..3f8a4cb193 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -21,9 +21,9 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256 build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.0/bazel_0.16.1/default:toolchain build --extra_toolchains=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.0/bazel_0.16.1/cpp:cc-toolchain-clang-x86_64-default # Use custom execution platforms defined in third_party/toolchains -build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604 +build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large build --host_platform=//third_party/toolchains:rbe_ubuntu1604 -build --platforms=//third_party/toolchains:rbe_ubuntu1604 +build --platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large build --spawn_strategy=remote build --strategy=Javac=remote -- cgit v1.2.3 From 8006dddea2f8e6d6f4bb77c9aa64c21ee09674ec Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Wed, 14 Nov 2018 15:49:00 -0800 Subject: updated toolchain subversion --- tools/remote_build/rbe_common.bazelrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index 3f8a4cb193..6718c3aade 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -76,7 +76,7 @@ build:ubsan --copt=-gmlt # TODO(jtattermusch): use more reasonable test timeout build:ubsan --test_timeout=3600 # override the config-agnostic crosstool_top ---crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.0/bazel_0.16.1/ubsan:toolchain +--crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan:toolchain # 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 # and we get test failures. -- cgit v1.2.3 From 2532b8488c1745bb9afee54268997337edd89dac Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Wed, 14 Nov 2018 15:49:45 -0800 Subject: updated toolchain subversion --- tools/remote_build/rbe_common.bazelrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index 6718c3aade..583781effc 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -18,8 +18,8 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256 -build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.0/bazel_0.16.1/default:toolchain -build --extra_toolchains=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.0/bazel_0.16.1/cpp:cc-toolchain-clang-x86_64-default +build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain +build --extra_toolchains=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/cpp:cc-toolchain-clang-x86_64-default # 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 --host_platform=//third_party/toolchains:rbe_ubuntu1604 @@ -59,9 +59,9 @@ build:msan --cxxopt=--stdlib=libc++ # setting LD_LIBRARY_PATH is necessary # to avoid "libc++.so.1: cannot open shared object file" build:msan --action_env=LD_LIBRARY_PATH=/usr/local/lib -build:msan --host_crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.0/bazel_0.16.1/default:toolchain +build:msan --host_crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain # override the config-agnostic crosstool_top -build:msan --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.0/bazel_0.16.1/msan:toolchain +build:msan --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan:toolchain # thread sanitizer: most settings are already in %workspace%/.bazelrc # we only need a few additional ones that are Foundry specific -- cgit v1.2.3 From d069bb2444a38021caf3ab4eee489fa2310fe7a8 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Wed, 14 Nov 2018 16:25:31 -0800 Subject: more destination fixes --- third_party/toolchains/BUILD | 8 ++++---- tools/remote_build/rbe_common.bazelrc | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index efb52736fe..f5767f212d 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -35,8 +35,8 @@ platform( "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", "@bazel_tools//tools/cpp:clang", - "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", - "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", + "@bazel_toolchains//constraints:xenial", + "@bazel_toolchains//constraints/sanitizers:support_msan", "//third_party/toolchains/machine_size:standard", ], remote_execution_properties = """ @@ -58,8 +58,8 @@ platform( "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", "@bazel_tools//tools/cpp:clang", - "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", - "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", + "@bazel_toolchains//constraints:xenial", + "@@bazel_toolchains//constraints/sanitizers:support_msan", "//third_party/toolchains/machine_size:large", ], remote_execution_properties = """ diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index 583781effc..f17ed10f57 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -18,8 +18,8 @@ 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 --extra_toolchains=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/cpp:cc-toolchain-clang-x86_64-default +build --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain +build --extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/cpp:cc-toolchain-clang-x86_64-default # 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 --host_platform=//third_party/toolchains:rbe_ubuntu1604 @@ -59,9 +59,9 @@ build:msan --cxxopt=--stdlib=libc++ # setting LD_LIBRARY_PATH is necessary # to avoid "libc++.so.1: cannot open shared object file" 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=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain # 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=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan:toolchain # thread sanitizer: most settings are already in %workspace%/.bazelrc # we only need a few additional ones that are Foundry specific @@ -76,7 +76,7 @@ build:ubsan --copt=-gmlt # TODO(jtattermusch): use more reasonable test timeout build:ubsan --test_timeout=3600 # 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=@bazel_toolchains//configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan:toolchain # 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 # and we get test failures. -- cgit v1.2.3 From caf56447d5b67092b99ea74dbe5a7ec9cc7c6b1d Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 10:52:41 -0800 Subject: added custom platform --- third_party/toolchains/BUILD | 20 ++++++++++++++++++++ tools/remote_build/rbe_common.bazelrc | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index f5767f212d..b9a8cfd46a 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -73,3 +73,23 @@ platform( } """, ) + +# This target is auto-generated from release/cpp.tpl and should not be +# modified directly. +toolchain( + name = "cc-toolchain-clang-x86_64-default", + exec_compatible_with = [ + "@bazel_tools//platforms:linux", + "@bazel_tools//platforms:x86_64", + "@bazel_tools//tools/cpp:clang", + "//constraints:xenial", + ], + target_compatible_with = [ + "//third_party/toolchains:rbe_ubuntu1604", + "//third_party/toolchains:rbe_ubuntu1604_large", + "@bazel_tools//platforms:linux", + "@bazel_tools//platforms:x86_64", + ], + toolchain = "//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:cc-compiler-k8", + toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", +) diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index f17ed10f57..82b59355cb 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -19,7 +19,7 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256 build --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain -build --extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/cpp: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 build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large build --host_platform=//third_party/toolchains:rbe_ubuntu1604 -- cgit v1.2.3 From 4d84165bb00b18bad657a6f8b09a97a655a08a29 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 13:56:30 -0800 Subject: added machine size to toolchain constraints --- third_party/toolchains/BUILD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index b9a8cfd46a..2699cf391d 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -83,6 +83,8 @@ toolchain( "@bazel_tools//platforms:x86_64", "@bazel_tools//tools/cpp:clang", "//constraints:xenial", + "//third_party/toolchains/machine_size:standard", + "//third_party/toolchains/machine_size:large", ], target_compatible_with = [ "//third_party/toolchains:rbe_ubuntu1604", -- cgit v1.2.3 From 17ce7e0d94d147040c86cd3d92b03d46f591f681 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 14:26:30 -0800 Subject: addressed Nick's comments --- third_party/toolchains/BUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 2699cf391d..27a62b7495 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -59,7 +59,7 @@ platform( "@bazel_tools//platforms:linux", "@bazel_tools//tools/cpp:clang", "@bazel_toolchains//constraints:xenial", - "@@bazel_toolchains//constraints/sanitizers:support_msan", + "@bazel_toolchains//constraints/sanitizers:support_msan", "//third_party/toolchains/machine_size:large", ], remote_execution_properties = """ @@ -82,7 +82,8 @@ toolchain( "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", "@bazel_tools//tools/cpp:clang", - "//constraints:xenial", + "@bazel_toolchains//constraints:xenial", + "@bazel_toolchains//constraints/sanitizers:support_msan", "//third_party/toolchains/machine_size:standard", "//third_party/toolchains/machine_size:large", ], -- cgit v1.2.3 From 8575588fde9cfb7c8ab1bcd550e13b2f635a9292 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 14:32:35 -0800 Subject: added path prefix to bazel_toolchains repo --- third_party/toolchains/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 27a62b7495..e7ef03f5db 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -93,6 +93,6 @@ toolchain( "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", ], - toolchain = "//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:cc-compiler-k8", + toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:cc-compiler-k8", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", ) -- cgit v1.2.3 From 3f70672827018b97e7ce13be826d91e8455ce19f Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 14:39:29 -0800 Subject: reverted bazel-toolchains alias to its original form --- third_party/toolchains/BUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index e7ef03f5db..4b075eb7dc 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -35,8 +35,8 @@ platform( "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", "@bazel_tools//tools/cpp:clang", - "@bazel_toolchains//constraints:xenial", - "@bazel_toolchains//constraints/sanitizers:support_msan", + "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", + "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", "//third_party/toolchains/machine_size:standard", ], remote_execution_properties = """ @@ -58,8 +58,8 @@ platform( "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", "@bazel_tools//tools/cpp:clang", - "@bazel_toolchains//constraints:xenial", - "@bazel_toolchains//constraints/sanitizers:support_msan", + "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", + "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", "//third_party/toolchains/machine_size:large", ], remote_execution_properties = """ @@ -82,8 +82,8 @@ toolchain( "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", "@bazel_tools//tools/cpp:clang", - "@bazel_toolchains//constraints:xenial", - "@bazel_toolchains//constraints/sanitizers:support_msan", + "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", + "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", "//third_party/toolchains/machine_size:standard", "//third_party/toolchains/machine_size:large", ], @@ -93,6 +93,6 @@ toolchain( "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", ], - toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:cc-compiler-k8", + toolchain = "@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:cc-compiler-k8", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", ) -- cgit v1.2.3 From 09b0b0b71207e716b990ed0fb8d1cfae435fbc43 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 14:50:05 -0800 Subject: Attempting Eric Burnett's fix --- third_party/toolchains/BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 4b075eb7dc..8b16b669df 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -88,8 +88,8 @@ toolchain( "//third_party/toolchains/machine_size:large", ], target_compatible_with = [ - "//third_party/toolchains:rbe_ubuntu1604", - "//third_party/toolchains:rbe_ubuntu1604_large", + # "//third_party/toolchains:rbe_ubuntu1604", + # "//third_party/toolchains:rbe_ubuntu1604_large", "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", ], -- cgit v1.2.3 From 365ce568e1d4b6a017f70af9639e25a32ac3745b Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 16:12:04 -0800 Subject: fixed incorrect repo name --- tools/remote_build/rbe_common.bazelrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index 82b59355cb..adcd6427cf 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -18,7 +18,7 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256 -build --crosstool_top=@bazel_toolchains//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.16.1/default:toolchain build --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-default # Use custom execution platforms defined in third_party/toolchains build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large @@ -59,9 +59,9 @@ build:msan --cxxopt=--stdlib=libc++ # setting LD_LIBRARY_PATH is necessary # to avoid "libc++.so.1: cannot open shared object file" build:msan --action_env=LD_LIBRARY_PATH=/usr/local/lib -build:msan --host_crosstool_top=@bazel_toolchains//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.16.1/default:toolchain # override the config-agnostic crosstool_top -build:msan --crosstool_top=@bazel_toolchains//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.16.1/msan:toolchain # thread sanitizer: most settings are already in %workspace%/.bazelrc # we only need a few additional ones that are Foundry specific @@ -76,7 +76,7 @@ build:ubsan --copt=-gmlt # TODO(jtattermusch): use more reasonable test timeout build:ubsan --test_timeout=3600 # override the config-agnostic crosstool_top ---crosstool_top=@bazel_toolchains//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.16.1/ubsan:toolchain # 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 # and we get test failures. -- cgit v1.2.3 From c3720d124a5a911e60107f1ed8cb0c6b86ff1112 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 16:34:46 -0800 Subject: attempting single platform --- tools/remote_build/rbe_common.bazelrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index adcd6427cf..77ce96b8d4 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -23,7 +23,7 @@ build --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-defa # 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 --host_platform=//third_party/toolchains:rbe_ubuntu1604 -build --platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large +build --platforms=//third_party/toolchains:rbe_ubuntu1604 build --spawn_strategy=remote build --strategy=Javac=remote -- cgit v1.2.3 From 6cbbefc6c6f03bf6d48816f36f2d496768c39a12 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Thu, 15 Nov 2018 16:47:51 -0800 Subject: temporarily removed some constraints --- third_party/toolchains/BUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 8b16b669df..bf32ae4786 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -35,9 +35,9 @@ platform( "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", "@bazel_tools//tools/cpp:clang", - "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", - "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", - "//third_party/toolchains/machine_size:standard", + # "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", + # "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", + # "//third_party/toolchains/machine_size:standard", ], remote_execution_properties = """ properties: { @@ -82,10 +82,10 @@ toolchain( "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", "@bazel_tools//tools/cpp:clang", - "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", - "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", - "//third_party/toolchains/machine_size:standard", - "//third_party/toolchains/machine_size:large", + # "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", + # "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", + # "//third_party/toolchains/machine_size:standard", + # "//third_party/toolchains/machine_size:large", ], target_compatible_with = [ # "//third_party/toolchains:rbe_ubuntu1604", -- cgit v1.2.3 From 8fad166c854d9685233457c1848661bc48e4986f Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Mon, 19 Nov 2018 16:11:57 -0800 Subject: added autoconfigured --- third_party/toolchains/BUILD | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index bf32ae4786..bbaecae565 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -35,9 +35,9 @@ platform( "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", "@bazel_tools//tools/cpp:clang", - # "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", - # "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", - # "//third_party/toolchains/machine_size:standard", + "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", + "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", + "//third_party/toolchains/machine_size:standard", ], remote_execution_properties = """ properties: { @@ -79,17 +79,18 @@ platform( toolchain( name = "cc-toolchain-clang-x86_64-default", exec_compatible_with = [ + "@bazel_tools//platforms:autoconfigured", "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", "@bazel_tools//tools/cpp:clang", - # "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", - # "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", - # "//third_party/toolchains/machine_size:standard", - # "//third_party/toolchains/machine_size:large", + "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", + "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", + "//third_party/toolchains/machine_size:standard", + "//third_party/toolchains/machine_size:large", ], target_compatible_with = [ - # "//third_party/toolchains:rbe_ubuntu1604", - # "//third_party/toolchains:rbe_ubuntu1604_large", + "//third_party/toolchains:rbe_ubuntu1604", + "//third_party/toolchains:rbe_ubuntu1604_large", "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", ], -- cgit v1.2.3 From c04583f6475981d7f2874d51cb39b2e68617f0f3 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 20 Nov 2018 15:23:08 -0800 Subject: registered toolchain and platform --- WORKSPACE | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index a547c24cbe..d75d093896 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,45 +1,59 @@ -workspace(name="com_github_grpc_grpc") +workspace(name = "com_github_grpc_grpc") load("//bazel:grpc_deps.bzl", "grpc_deps", "grpc_test_only_deps") + grpc_deps() + grpc_test_only_deps() +register_execution_platforms( + "//third_party/toolchains:all", +) + +register_toolchain( + "//third_party/toolchains:all", +) + new_http_archive( - name="cython", - sha256="d68138a2381afbdd0876c3cb2a22389043fa01c4badede1228ee073032b07a27", - urls=[ + name = "cython", + build_file = "//third_party:cython.BUILD", + sha256 = "d68138a2381afbdd0876c3cb2a22389043fa01c4badede1228ee073032b07a27", + strip_prefix = "cython-c2b80d87658a8525ce091cbe146cb7eaa29fed5c", + urls = [ "https://github.com/cython/cython/archive/c2b80d87658a8525ce091cbe146cb7eaa29fed5c.tar.gz", ], - strip_prefix="cython-c2b80d87658a8525ce091cbe146cb7eaa29fed5c", - build_file="//third_party:cython.BUILD", ) load("//third_party/py:python_configure.bzl", "python_configure") -python_configure(name="local_config_python") + +python_configure(name = "local_config_python") git_repository( - name="io_bazel_rules_python", - remote="https://github.com/bazelbuild/rules_python.git", - commit="8b5d0683a7d878b28fffe464779c8a53659fc645", + name = "io_bazel_rules_python", + commit = "8b5d0683a7d878b28fffe464779c8a53659fc645", + remote = "https://github.com/bazelbuild/rules_python.git", ) load("@io_bazel_rules_python//python:pip.bzl", "pip_repositories", "pip_import") pip_repositories() + pip_import( - name="grpc_python_dependencies", - requirements="//:requirements.bazel.txt", + name = "grpc_python_dependencies", + requirements = "//:requirements.bazel.txt", ) load("@grpc_python_dependencies//:requirements.bzl", "pip_install") + pip_install() # NOTE(https://github.com/pubref/rules_protobuf/pull/196): Switch to upstream repo after this gets merged. git_repository( - name="org_pubref_rules_protobuf", - remote="https://github.com/ghostwriternr/rules_protobuf", - tag="v0.8.2.1-alpha", + name = "org_pubref_rules_protobuf", + remote = "https://github.com/ghostwriternr/rules_protobuf", + tag = "v0.8.2.1-alpha", ) load("@org_pubref_rules_protobuf//python:rules.bzl", "py_proto_repositories") + py_proto_repositories() -- cgit v1.2.3 From a548f1cc64c781c0d9a0051b7a44d2b19bd5a934 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 20 Nov 2018 15:43:24 -0800 Subject: fixed typo on WORKSPACE file --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index d75d093896..cd2718204d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -10,7 +10,7 @@ register_execution_platforms( "//third_party/toolchains:all", ) -register_toolchain( +register_toolchains( "//third_party/toolchains:all", ) -- cgit v1.2.3 From 4a9feff1fd9a0e789f10ea7b556a7af8f878e70d Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 20 Nov 2018 16:15:42 -0800 Subject: removed autoconfigured constraint --- third_party/toolchains/BUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index bbaecae565..2a68f3e7cc 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -71,7 +71,7 @@ platform( name: "gceMachineType" # Small machines for majority of tests. value: "n1-standard-8" } - """, + """, ) # This target is auto-generated from release/cpp.tpl and should not be @@ -79,7 +79,6 @@ platform( toolchain( name = "cc-toolchain-clang-x86_64-default", exec_compatible_with = [ - "@bazel_tools//platforms:autoconfigured", "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", "@bazel_tools//tools/cpp:clang", -- cgit v1.2.3 From 3391245e739f587ded080aa62b104af1d66f0b79 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 20 Nov 2018 16:18:17 -0800 Subject: removed all constraints from custom toolchain --- third_party/toolchains/BUILD | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 2a68f3e7cc..7506c6a1fb 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -79,19 +79,8 @@ platform( toolchain( name = "cc-toolchain-clang-x86_64-default", exec_compatible_with = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", - "@bazel_tools//tools/cpp:clang", - "@com_github_bazelbuild_bazeltoolchains//constraints:xenial", - "@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan", - "//third_party/toolchains/machine_size:standard", - "//third_party/toolchains/machine_size:large", ], target_compatible_with = [ - "//third_party/toolchains:rbe_ubuntu1604", - "//third_party/toolchains:rbe_ubuntu1604_large", - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", ], toolchain = "@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:cc-compiler-k8", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", -- cgit v1.2.3 From 70f9992d77e67f90234b079eabaa33210d866c87 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Mon, 26 Nov 2018 10:10:53 -0800 Subject: modified execution platform registration, added host platform --- WORKSPACE | 4 ---- third_party/toolchains/BUILD | 22 ++++++++++++++++++++++ tools/remote_build/rbe_common.bazelrc | 3 ++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index cd2718204d..1340ba0c6b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -6,10 +6,6 @@ grpc_deps() grpc_test_only_deps() -register_execution_platforms( - "//third_party/toolchains:all", -) - register_toolchains( "//third_party/toolchains:all", ) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 7506c6a1fb..39699f3112 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -74,6 +74,28 @@ platform( """, ) +platform( + name = "host_platform-large", + constraint_values = [ + "//third_party/toolchains/machine_size:large", + ], + cpu_constraints = [ + "@bazel_tools//platforms:x86_32", + "@bazel_tools//platforms:x86_64", + "@bazel_tools//platforms:ppc", + "@bazel_tools//platforms:arm", + "@bazel_tools//platforms:aarch64", + "@bazel_tools//platforms:s390x", + ], + host_platform = True, + os_constraints = [ + "@bazel_tools//platforms:osx", + "@bazel_tools//platforms:freebsd", + "@bazel_tools//platforms:linux", + "@bazel_tools//platforms:windows", + ], +) + # This target is auto-generated from release/cpp.tpl and should not be # modified directly. toolchain( diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index 77ce96b8d4..c1ee428082 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -21,7 +21,7 @@ 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 --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-default # 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,//third_party/toolchains:host_platform-large build --host_platform=//third_party/toolchains:rbe_ubuntu1604 build --platforms=//third_party/toolchains:rbe_ubuntu1604 @@ -69,6 +69,7 @@ build:tsan --copt=-gmlt # TODO(jtattermusch): use more reasonable test timeout build:tsan --test_timeout=3600 build:tsan --test_tag_filters=-qps_json_driver,-json_run_localhost +build:tsan --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large # undefined behavior sanitizer: most settings are already in %workspace%/.bazelrc # we only need a few additional ones that are Foundry specific -- cgit v1.2.3 From 1e53e3c17fdca56340a5c2ceb8261b77fa1cb1a7 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Mon, 26 Nov 2018 10:26:07 -0800 Subject: added back platform registration to WORKSPACE --- WORKSPACE | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index 1340ba0c6b..cd2718204d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -6,6 +6,10 @@ grpc_deps() grpc_test_only_deps() +register_execution_platforms( + "//third_party/toolchains:all", +) + register_toolchains( "//third_party/toolchains:all", ) -- cgit v1.2.3 From 74b780e0968ede809d69ce8c69e7e1e5d8685ce5 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 27 Nov 2018 11:03:51 -0800 Subject: added toolchain_resolution_debug for displaying platform --- tools/remote_build/rbe_common.bazelrc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index 474f45bf53..df72f129ab 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -37,6 +37,7 @@ build --verbose_failures=true build --experimental_strict_action_env=true build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 +build --toolchain_resolution_debug # don't use port server build --define GRPC_PORT_ISOLATED_RUNTIME=1 -- cgit v1.2.3 From 49528b9713d0e60cdb7806cb3c10e2e5b9a92f03 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 27 Nov 2018 14:13:28 -0800 Subject: trying highmem machine --- third_party/toolchains/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 39699f3112..9481d3b137 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -69,7 +69,7 @@ platform( } properties: { name: "gceMachineType" # Small machines for majority of tests. - value: "n1-standard-8" + value: "n1-highmem-8" } """, ) -- cgit v1.2.3 From eff3b4ec306e4b7cdedab5b42fbbde8f800208aa Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 27 Nov 2018 15:13:33 -0800 Subject: trying standard-16 machine --- third_party/toolchains/BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 9481d3b137..7df0074b40 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -68,8 +68,8 @@ platform( value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:9bd8ba020af33edb5f11eff0af2f63b3bcb168cd6566d7b27c6685e717787928" } properties: { - name: "gceMachineType" # Small machines for majority of tests. - value: "n1-highmem-8" + name: "gceMachineType" # Large machines for some resource demanding tests (TSAN). + value: "n1-standard-16" } """, ) -- cgit v1.2.3 From e00b58ba5aa2e6683b156570eb785e679a628d3b Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 27 Nov 2018 15:25:30 -0800 Subject: trying latest image --- third_party/toolchains/BUILD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 7df0074b40..2736543fcf 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -20,17 +20,17 @@ package(default_visibility = ["//visibility:public"]) # Update every time when a new container is released. alias( name = "rbe_ubuntu1604", - actual = ":rbe_ubuntu1604_r340178", + actual = ":rbe_ubuntu1604_r342117", ) alias( name = "rbe_ubuntu1604_large", - actual = ":rbe_ubuntu1604_r340178_large", + actual = ":rbe_ubuntu1604_r342117_large", ) -# RBE Ubuntu16_04 r340178 +# RBE Ubuntu16_04 r342117 platform( - name = "rbe_ubuntu1604_r340178", + name = "rbe_ubuntu1604_r342117", constraint_values = [ "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", @@ -42,7 +42,7 @@ platform( remote_execution_properties = """ properties: { name: "container-image" - value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:9bd8ba020af33edb5f11eff0af2f63b3bcb168cd6566d7b27c6685e717787928" + value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:f3120a030a19d67626ababdac79cc787e699a1aa924081431285118f87e7b375" } properties: { name: "gceMachineType" # Small machines for majority of tests. @@ -51,9 +51,9 @@ platform( """, ) -# RBE Ubuntu16_04 r340178 large +# RBE Ubuntu16_04 r342117 large platform( - name = "rbe_ubuntu1604_r340178_large", + name = "rbe_ubuntu1604_r342117_large", constraint_values = [ "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", @@ -65,11 +65,11 @@ platform( remote_execution_properties = """ properties: { name: "container-image" - value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:9bd8ba020af33edb5f11eff0af2f63b3bcb168cd6566d7b27c6685e717787928" + value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:f3120a030a19d67626ababdac79cc787e699a1aa924081431285118f87e7b375" } properties: { name: "gceMachineType" # Large machines for some resource demanding tests (TSAN). - value: "n1-standard-16" + value: "n1-standard-8" } """, ) -- cgit v1.2.3 From fbd3808d0d2e00c2f070145366a96786dafdc804 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Wed, 28 Nov 2018 10:32:00 -0800 Subject: added exec_compatible_with to sh_test --- bazel/grpc_build_system.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 22c77e468f..65fe5a10aa 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -163,6 +163,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data "$(location %s)" % name, ] + args["args"], tags = tags, + exec_compatible_with = exec_compatible_with, ) else: native.cc_test(**args) -- cgit v1.2.3 From 527ddd99821cd0e0970fdd5b5b4988394f0ea078 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Wed, 28 Nov 2018 11:10:05 -0800 Subject: cleanup --- third_party/toolchains/BUILD | 22 ---------------------- tools/remote_build/rbe_common.bazelrc | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 2736543fcf..e213461acc 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -74,28 +74,6 @@ platform( """, ) -platform( - name = "host_platform-large", - constraint_values = [ - "//third_party/toolchains/machine_size:large", - ], - cpu_constraints = [ - "@bazel_tools//platforms:x86_32", - "@bazel_tools//platforms:x86_64", - "@bazel_tools//platforms:ppc", - "@bazel_tools//platforms:arm", - "@bazel_tools//platforms:aarch64", - "@bazel_tools//platforms:s390x", - ], - host_platform = True, - os_constraints = [ - "@bazel_tools//platforms:osx", - "@bazel_tools//platforms:freebsd", - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:windows", - ], -) - # This target is auto-generated from release/cpp.tpl and should not be # modified directly. toolchain( diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index df72f129ab..aa3ddb050c 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -21,7 +21,7 @@ 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 --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-default # Use custom execution platforms defined in third_party/toolchains -build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large,//third_party/toolchains:host_platform-large +build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large build --host_platform=//third_party/toolchains:rbe_ubuntu1604 build --platforms=//third_party/toolchains:rbe_ubuntu1604 @@ -37,7 +37,6 @@ build --verbose_failures=true build --experimental_strict_action_env=true build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 -build --toolchain_resolution_debug # don't use port server build --define GRPC_PORT_ISOLATED_RUNTIME=1 -- cgit v1.2.3