aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--third_party/toolchains/BUILD16
-rwxr-xr-xtools/internal_ci/linux/grpc_bazel_on_foundry_base.sh2
2 files changed, 12 insertions, 6 deletions
diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD
index 7d43bdd1d7..1933072ff1 100644
--- a/third_party/toolchains/BUILD
+++ b/third_party/toolchains/BUILD
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+licenses(["notice"]) # Apache v2
+
package(default_visibility = ["//visibility:public"])
# Latest RBE Ubuntu16_04 container
@@ -32,9 +34,13 @@ platform(
"@com_github_bazelbuild_bazeltoolchains//constraints/sanitizers:support_msan",
],
remote_execution_properties = """
- properties: {
- name: "container-image"
- value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:59bf0e191a6b5cc1ab62c2224c810681d1326bad5a27b1d36c9f40113e79da7f"
- }
- """,
+ properties: {
+ name: "container-image"
+ value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:59bf0e191a6b5cc1ab62c2224c810681d1326bad5a27b1d36c9f40113e79da7f"
+ }
+ properties: {
+ name: "gceMachineType"
+ value: "n1-highmem-2"
+ }
+ """,
)
diff --git a/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh b/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh
index a8a517eb90..8f9658f78a 100755
--- a/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh
+++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh
@@ -54,7 +54,7 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc
--action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 \
--extra_toolchains=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.0/bazel_0.13.0/cpp:cc-toolchain-clang-x86_64-default \
--extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604 \
- --host_platforms=//third_party/toolchains:rbe_ubuntu1604 \
+ --host_platform=//third_party/toolchains:rbe_ubuntu1604 \
--platforms=//third_party/toolchains:rbe_ubuntu1604 \
$1 \
-- //test/... || FAILED="true"