Add Mac ARM64 to Dawn CQ
Bug: chromium:1442214
Change-Id: Icaf581f4045414e657bd41954f9046223d62aec6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/164747
Reviewed-by: Brian Sheedy <bsheedy@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Austin Eng <enga@chromium.org>
diff --git a/infra/config/global/generated/commit-queue.cfg b/infra/config/global/generated/commit-queue.cfg
index 22402b4..4802d4e 100644
--- a/infra/config/global/generated/commit-queue.cfg
+++ b/infra/config/global/generated/commit-queue.cfg
@@ -87,6 +87,20 @@
}
}
builders {
+ name: "chromium/try/mac-arm64-dawn-rel"
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ path_regexp: ".*"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ path_regexp: "\\.github/.+"
+ exclude: true
+ }
+ }
+ builders {
name: "chromium/try/mac-dawn-rel"
location_filters {
gerrit_host_regexp: ".*"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index aedc1a2..9456948 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -429,15 +429,26 @@
_os_arch_to_branch_builder = {
"linux": "dawn-linux-x64-deps-rel",
"mac": "dawn-mac-x64-deps-rel",
+ "mac-arm64": "dawn-mac-arm64-deps-rel",
"win": "dawn-win10-x64-deps-rel",
"android-arm": "dawn-android-arm-deps-rel",
"android-arm64": "dawn-android-arm64-deps-rel",
}
+_os_arch_to_dawn_cq_builder = {
+ "linux": "linux-dawn-rel",
+ "mac": "mac-dawn-rel",
+ "mac-arm64": "mac-arm64-dawn-rel",
+ "win": "win-dawn-rel",
+ "android-arm": "android-dawn-arm-rel",
+ "android-arm64": "android-dawn-arm64-rel",
+}
+
# The earliest milestone that the builder is relevant for
_os_arch_to_min_milestone = {
"linux": 112,
"mac": 112,
+ "mac-arm64": 122,
"win": 112,
"android-arm": None,
"android-arm64": None,
@@ -454,7 +465,8 @@
if arch:
luci.cq_tryjob_verifier(
cq_group = "Dawn-CQ",
- builder = "chromium:try/{os}-dawn-{arch}-rel".format(os = os, arch = arch),
+ builder = "chromium:try/{builder}".format(builder =
+ _os_arch_to_dawn_cq_builder["{os}-{arch}".format(os = os, arch = arch)]),
location_filters = [
cq.location_filter(path_regexp = ".*"),
cq.location_filter(
@@ -569,6 +581,7 @@
chromium_dawn_tryjob("linux")
chromium_dawn_tryjob("mac")
+chromium_dawn_tryjob("mac", "arm64")
chromium_dawn_tryjob("win")
chromium_dawn_tryjob("android", "arm")
chromium_dawn_tryjob("android", "arm64")
