Merge branch 'master' into fix-dns-job-2

test/core/gpr/BUILD

@@ -86,6 +86,7 @@ grpc_cc_test(
         "//:gpr",
         "//test/core/util:gpr_test_util",
     ],
+    data = ["//third_party/toolchains:RBE_USE_MACHINE_TYPE_LARGE"],
 )
 
 grpc_cc_test(

test/core/iomgr/BUILD

@@ -47,6 +47,7 @@ grpc_cc_test(
         "//test/core/util:gpr_test_util",
         "//test/core/util:grpc_test_util",
     ],
+    data = ["//third_party/toolchains:RBE_USE_MACHINE_TYPE_LARGE"],
 )
 
 grpc_cc_test(

test/cpp/qps/BUILD

@@ -176,6 +176,7 @@ grpc_cc_test(
         "//test/cpp/util:test_config",
         "//test/cpp/util:test_util",
     ],
+    data = ["//third_party/toolchains:RBE_USE_MACHINE_TYPE_LARGE"],
 )
 
 grpc_cc_test(

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"
-          value: "n1-highmem-2"
+          name: "gceMachineType"  # Small machines for majority of tests.
+          value: "n1-standard-1"
+        }
+        properties: {
+          name: "gceMachineType_LARGE"  # Large machines for a small set of resource-consuming tests such as combiner_tests under TSAN.
+          value: "n1-standard-8"
         }
         """,
 )

third_party/toolchains/RBE_USE_MACHINE_TYPE_LARGE

@@ -0,0 +1 @@
+# This file is a sentinel and is meant to be empty.