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 <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 763652a..80cb558 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -74,7 +74,7 @@
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 @@
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 4c06da3..fad92b2 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -214,7 +214,7 @@
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"
