From 613393324f5d3afb54b8f3d0ccae13d9756ac511 Mon Sep 17 00:00:00 2001
From: Victor Hugo Vianna Silva <victorvianna@google.com>
Date: Tue, 14 Oct 2025 17:54:58 +0100
Subject: [PATCH] Fix CQ not finding Mac-15 x86_64 bots

https://crrev.com/c/7037174 took effect but now CQ finds no Mac-15
x86_64 bots [1]. Fix by switching to arm64.
This change lists "No-Try: True" because CQ is busted.

[1] https://ci.chromium.org/ui/p/libyuv/builders/try/ios_arm64/3589/infra

No-Try: True
Bug: chromium:448679376
Change-Id: I6b77ce004f8cbbe0ea5c434edd140dd1ece6a152
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/7041203
Reviewed-by: Ben Weiss <bweiss@google.com>
Commit-Queue: Wan-Teh Chang <wtc@google.com>
Reviewed-by: Justin Green <greenjustin@google.com>
Reviewed-by: Wan-Teh Chang <wtc@google.com>
---
 infra/config/cr-buildbucket.cfg | 20 ++++++++++----------
 infra/config/main.star          |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index dda8d121f..73a6d4929 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -335,7 +335,7 @@ buckets {
       name: "Mac Asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.ci"
       recipe {
@@ -358,7 +358,7 @@ buckets {
       name: "Mac64 Debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.ci"
       recipe {
@@ -381,7 +381,7 @@ buckets {
       name: "Mac64 Release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.ci"
       recipe {
@@ -556,7 +556,7 @@ buckets {
       name: "iOS ARM64 Debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.ci"
       recipe {
@@ -579,7 +579,7 @@ buckets {
       name: "iOS ARM64 Release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.ci"
       recipe {
@@ -742,7 +742,7 @@ buckets {
       name: "ios_arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.try"
       recipe {
@@ -765,7 +765,7 @@ buckets {
       name: "ios_arm64_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.try"
       recipe {
@@ -940,7 +940,7 @@ buckets {
       name: "mac"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.try"
       recipe {
@@ -963,7 +963,7 @@ buckets {
       name: "mac_asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.try"
       recipe {
@@ -986,7 +986,7 @@ buckets {
       name: "mac_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "os:Mac-15"
       dimensions: "pool:luci.flex.try"
       recipe {
diff --git a/infra/config/main.star b/infra/config/main.star
index 6a2983372..801cc8f35 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -195,7 +195,7 @@ def get_os_dimensions(os):
     if os == "android":
         return {"device_type": "walleye"}
     if os == "ios" or os == "mac":
-        return {"os": "Mac-15", "cpu": "x86-64"}
+        return {"os": "Mac-15", "cpu": "arm64"}
     elif os == "win":
         return {"os": "Windows-10", "cores": "8", "cpu": "x86-64"}
     elif os == "linux":