aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
m---------third_party/boringssl0
m---------third_party/boringssl-with-bazel0
-rw-r--r--third_party/toolchains/BUILD8
-rw-r--r--third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE1
4 files changed, 8 insertions, 1 deletions
diff --git a/third_party/boringssl b/third_party/boringssl
-Subproject 70ef9596bbcc11353b9bb8d4e91478694dd2143
+Subproject b29b21a81b32ec273f118f589f46d56ad333242
diff --git a/third_party/boringssl-with-bazel b/third_party/boringssl-with-bazel
-Subproject dcd3e6e6ecddf059adb48fca45bc7346a108bdd
+Subproject 8149b351bf797bd80e063787886b7618f508e45
diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD
index 1933072ff1..02cd87a7b9 100644
--- a/third_party/toolchains/BUILD
+++ b/third_party/toolchains/BUILD
@@ -16,6 +16,8 @@ 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(
@@ -39,8 +41,12 @@ platform(
value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:59bf0e191a6b5cc1ab62c2224c810681d1326bad5a27b1d36c9f40113e79da7f"
}
properties: {
- name: "gceMachineType"
+ name: "gceMachineType" # Small machines for majority of tests.
value: "n1-highmem-2"
}
+ properties: {
+ name: "gceMachineType_LARGE" # Large machines for a small set of resource-consuming tests such as combiner_tests under TSAN.
+ value: "n1-standard-8"
+ }
""",
)
diff --git a/third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE b/third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE
new file mode 100644
index 0000000000..b1120238d7
--- /dev/null
+++ b/third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE
@@ -0,0 +1 @@
+# This file is a sentinel and is meant to be empty.