LUCI: Limit userfault GC builds to Pixel 6
Change-Id: I94802bce1431f53721d498f4efaf9bd8865adfea
diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index 887b2af..3b35718 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -66,6 +66,7 @@
name: "angler-armv7-non-gen-cc"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builder:angler-armv7-non-gen-cc"
+ dimensions: "device_type:oriole"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -138,6 +139,7 @@
name: "angler-armv8-non-gen-cc"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builder:angler-armv8-non-gen-cc"
+ dimensions: "device_type:oriole"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
diff --git a/tools/luci/config/generated/project.cfg b/tools/luci/config/generated/project.cfg
index e066382..f9f7877 100644
--- a/tools/luci/config/generated/project.cfg
+++ b/tools/luci/config/generated/project.cfg
@@ -7,7 +7,7 @@
name: "art"
access: "group:all"
lucicfg {
- version: "1.31.4"
+ version: "1.33.7"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index 5dd2fea..011ac67 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -154,7 +154,7 @@
refs = ["refs/heads/master-art"],
)
-def ci_builder(name, category, short_name):
+def ci_builder(name, category, short_name, dimensions={}):
luci.builder(
name = name,
bucket = "ci",
@@ -163,7 +163,7 @@
cipd_version = "refs/heads/main",
name = "art",
),
- dimensions = {
+ dimensions = dimensions | {
"pool": "luci.art.ci",
# Some builders require specific hardware, so we make the assignment in bots.cfg
@@ -202,11 +202,14 @@
short_name = short_name,
)
+# userfault-GC configurations must be run on Pixel 6.
+userfault_gc_target_dims = {"device_type": "oriole"}
+
ci_builder("angler-armv7-debug", "angler|armv7", "dbg")
-ci_builder("angler-armv7-non-gen-cc", "angler|armv7", "ngen")
+ci_builder("angler-armv7-non-gen-cc", "angler|armv7", "ngen", userfault_gc_target_dims)
ci_builder("angler-armv7-ndebug", "angler|armv7", "ndbg")
ci_builder("angler-armv8-debug", "angler|armv8", "dbg")
-ci_builder("angler-armv8-non-gen-cc", "angler|armv8", "ngen")
+ci_builder("angler-armv8-non-gen-cc", "angler|armv8", "ngen", userfault_gc_target_dims)
ci_builder("angler-armv8-ndebug", "angler|armv8", "ndbg")
ci_builder("bullhead-armv7-gcstress-ndebug", "bullhead|armv7|gcstress", "dbg")
ci_builder("bullhead-armv8-gcstress-debug", "bullhead|armv8|gcstress", "dbg")