Remove gn_v2 Mac builder special cases
Removes the special cases around gn_v2 Mac builders now that all tests
are run on Swarming and dawn.node tests are no longer implicitly tied to
the architecture that was used by the parent builder.
Bug: 441328362
Change-Id: I3ce8d3e186f8b20149303b25dabcc99a68aa749a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/264754
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/luci/cr-buildbucket.cfg
index 8d77cd3..485e279 100644
--- a/infra/config/global/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -2722,7 +2722,6 @@
name: "dawn-mac-x64-builder-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
- dimensions: "cpu:x86-64"
dimensions: "os:Mac-15"
dimensions: "pool:luci.chromium.gpu.ci"
exe {
@@ -2899,7 +2898,6 @@
name: "dawn-mac-x64-builder-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
- dimensions: "cpu:x86-64"
dimensions: "os:Mac-15"
dimensions: "pool:luci.chromium.gpu.ci"
exe {
@@ -3076,9 +3074,10 @@
name: "dawn-mac-x64-sws-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
- dimensions: "cpu:x86-64"
- dimensions: "os:Mac-15"
+ dimensions: "cores:2"
+ dimensions: "os:Ubuntu-22.04"
dimensions: "pool:luci.chromium.gpu.ci"
+ dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
@@ -3231,9 +3230,10 @@
name: "dawn-mac-x64-sws-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
- dimensions: "cpu:x86-64"
- dimensions: "os:Mac-15"
+ dimensions: "cores:2"
+ dimensions: "os:Ubuntu-22.04"
dimensions: "pool:luci.chromium.gpu.ci"
+ dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
@@ -8910,7 +8910,6 @@
name: "dawn-try-mac-x64-sws-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
- dimensions: "cpu:x86-64"
dimensions: "os:Mac-15"
dimensions: "pool:luci.chromium.gpu.try"
exe {
@@ -9075,7 +9074,6 @@
name: "dawn-try-mac-x64-sws-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
- dimensions: "cpu:x86-64"
dimensions: "os:Mac-15"
dimensions: "pool:luci.chromium.gpu.try"
exe {
diff --git a/infra/config/global/gn_standalone_ci.star b/infra/config/global/gn_standalone_ci.star
index 123fcd5..7606433 100644
--- a/infra/config/global/gn_standalone_ci.star
+++ b/infra/config/global/gn_standalone_ci.star
@@ -227,10 +227,6 @@
],
),
os = os.MAC_DEFAULT,
- # TODO(crbug.com/441328362): Remove this CPU restriction once both x64 and
- # ARM64 copies of Node are made available regardless of the host
- # architecture.
- cpu = "x86-64",
console_view_entry = consoles.console_view_entry(
category = "mac|build|clang|dbg",
short_name = "x64",
@@ -266,10 +262,6 @@
],
),
os = os.MAC_DEFAULT,
- # TODO(crbug.com/441328362): Remove this CPU restriction once both x64 and
- # ARM64 copies of Node are made available regardless of the host
- # architecture.
- cpu = "x86-64",
console_view_entry = consoles.console_view_entry(
category = "mac|build|clang|rel",
short_name = "x64",
@@ -602,18 +594,6 @@
# Child Testers #
################################################################################
-# TODO(crbug.com/441328362): Remove this and use normal/actually thin
-# Linux-based testers once all tests are run on Swarming. Currently, the
-# non-Swarmed tests fail since we try to run Mac binaries on a Linux host.
-def mac_thin_tester(**kwargs):
- ci.thin_tester(
- os = os.MAC_DEFAULT,
- # Necessary since the testers that use this are testing x64.
- cpu = "x86-64",
- cores = None,
- **kwargs
- )
-
ci.thin_tester(
name = "dawn-linux-x64-sws-dbg",
description_html = "Tests debug Dawn on Linux/x64 with SwiftShader",
@@ -710,7 +690,7 @@
),
)
-mac_thin_tester(
+ci.thin_tester(
name = "dawn-mac-x64-sws-dbg",
description_html = "Tests debug Dawn on Mac/x64 with SwiftShader",
parent = "dawn-mac-x64-builder-dbg",
@@ -734,7 +714,7 @@
),
)
-mac_thin_tester(
+ci.thin_tester(
name = "dawn-mac-x64-sws-rel",
description_html = "Tests release Dawn on Mac/x64 with SwiftShader",
parent = "dawn-mac-x64-builder-rel",
diff --git a/infra/config/global/gn_standalone_try.star b/infra/config/global/gn_standalone_try.star
index 32ac999..865d4ef 100644
--- a/infra/config/global/gn_standalone_try.star
+++ b/infra/config/global/gn_standalone_try.star
@@ -289,9 +289,6 @@
name = name,
max_concurrent_builds = 1,
os = os.MAC_DEFAULT,
- # TODO(crbug.com/441328362): Remove the architecture restriction once
- # all tests are run on Swarming.
- cpu = "x86-64",
**kwargs
)
