Convert Chromium/mac-lsan-fyi-rel to arm64 instead of intel
Updated ci and try mac-lsan-fyi-rel configs with arm64
Bug: 331224370
Change-Id: I754946c8845a3b9470f8a40e29f63c591634961d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5398458
Reviewed-by: Lindsay Pasricha <lindsayw@chromium.org>
Commit-Queue: Rahul Kumar Adudodla <adudodla@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1295501}
diff --git a/infra/config/generated/builders/ci/mac-lsan-fyi-rel/gn-args.json b/infra/config/generated/builders/ci/mac-lsan-fyi-rel/gn-args.json
index 4670429..80db405 100644
--- a/infra/config/generated/builders/ci/mac-lsan-fyi-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/mac-lsan-fyi-rel/gn-args.json
@@ -5,6 +5,7 @@
"is_component_build": false,
"is_debug": false,
"is_lsan": true,
+ "target_cpu": "x64",
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/try/mac-lsan-fyi-rel/gn-args.json b/infra/config/generated/builders/try/mac-lsan-fyi-rel/gn-args.json
index 4670429..80db405 100644
--- a/infra/config/generated/builders/try/mac-lsan-fyi-rel/gn-args.json
+++ b/infra/config/generated/builders/try/mac-lsan-fyi-rel/gn-args.json
@@ -5,6 +5,7 @@
"is_component_build": false,
"is_debug": false,
"is_lsan": true,
+ "target_cpu": "x64",
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 4f02bdf..bfa33d7b7 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -52175,7 +52175,7 @@
name: "mac-lsan-fyi-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
- dimensions: "cpu:x86-64"
+ dimensions: "cpu:arm64"
dimensions: "free_space:standard"
dimensions: "os:Mac"
dimensions: "pool:luci.chromium.ci"
@@ -97803,7 +97803,7 @@
name: "mac-lsan-fyi-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
- dimensions: "cpu:x86-64"
+ dimensions: "cpu:arm64"
dimensions: "os:Mac-14"
dimensions: "pool:luci.chromium.try"
dimensions: "ssd:1"
diff --git a/infra/config/subprojects/chromium/ci/chromium.memory.fyi.star b/infra/config/subprojects/chromium/ci/chromium.memory.fyi.star
index 1f6df99..8517e62 100644
--- a/infra/config/subprojects/chromium/ci/chromium.memory.fyi.star
+++ b/infra/config/subprojects/chromium/ci/chromium.memory.fyi.star
@@ -4,7 +4,7 @@
"""Definitions of builders in the chromium.memory.fyi builder group."""
load("//lib/builder_config.star", "builder_config")
-load("//lib/builders.star", "os", "reclient")
+load("//lib/builders.star", "cpu", "os", "reclient")
load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
load("//lib/gn_args.star", "gn_args")
@@ -139,11 +139,13 @@
"dcheck_always_on",
"release_builder",
"reclient",
+ "x64",
],
),
builderless = 1,
cores = None,
os = os.MAC_ANY,
+ cpu = cpu.ARM64,
console_view_entry = consoles.console_view_entry(
category = "mac|lsan",
short_name = "lsan",
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star b/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
index 6f7e0ddb..7b8ec83 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
@@ -237,6 +237,7 @@
"ci/mac-lsan-fyi-rel",
],
gn_args = "ci/mac-lsan-fyi-rel",
+ cpu = cpu.ARM64,
)
try_.builder(
