From cd535d2cce6e5d89936e551b3414dd10dff76fab Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Tue, 11 May 2021 13:13:55 -0400 Subject: [PATCH] infra: Switch Android ARM64 bots to compile-and-test. This will start to trigger tests on the Pixel 4 64-bit bots. Patch Series: 1. http://crrev.com/c/2885381 2. http://crrev.com/c/2885346 3. This CL 4. http://crrev.com/c/2885384 Bug: angleproject:5941 Change-Id: Ib76fd27d0814896522aad84443f52b7f47566e85 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2885383 Reviewed-by: Yuly Novikov Commit-Queue: Jamie Madill --- infra/config/generated/cr-buildbucket.cfg | 4 ++-- infra/config/main.star | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 763652a6f..80cb55806 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg @@ -74,7 +74,7 @@ buckets { cipd_version: "refs/heads/master" cmd: "recipes" } - properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"angle\",\"platform\":\"android\",\"recipe\":\"angle\",\"test_mode\":\"compile_only\",\"toolchain\":\"clang\"}" + properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"angle\",\"platform\":\"android\",\"recipe\":\"angle\",\"test_mode\":\"compile_and_test\",\"toolchain\":\"clang\"}" build_numbers: YES service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { @@ -480,7 +480,7 @@ buckets { cipd_version: "refs/heads/master" cmd: "recipes" } - properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"angle\",\"platform\":\"android\",\"recipe\":\"angle\",\"test_mode\":\"compile_only\",\"toolchain\":\"clang\"}" + properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"angle\",\"platform\":\"android\",\"recipe\":\"angle\",\"test_mode\":\"compile_and_test\",\"toolchain\":\"clang\"}" build_numbers: YES service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { diff --git a/infra/config/main.star b/infra/config/main.star index 4c06da3b7..fad92b2f3 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -214,7 +214,7 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, properties["test_mode"] = "trace_tests" elif toolchain == "gcc": properties["test_mode"] = "checkout_only" - elif debug or toolchain == "msvc" or config_os.category == os_category.ANDROID: + elif debug or toolchain == "msvc" or (config_os.category == os_category.ANDROID and cpu == "arm"): properties["test_mode"] = "compile_only" else: properties["test_mode"] = "compile_and_test"