Revert "LUCI: Use "device_type" dimension to select target bots."
This reverts commit 3e59c728cd862bcd23b61305c03764c41908ab99.
Reason for revert: Results in no tasks being scheduled
Change-Id: I2146e857b7b67362cf6f47aea89554fc38402727
diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index bcd09eb..f8a5337 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -17,10 +17,7 @@
builders {
name: "angler-armv7-debug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:angler-armv7-debug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -44,10 +41,7 @@
builders {
name: "angler-armv7-ndebug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:angler-armv7-ndebug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -71,8 +65,8 @@
builders {
name: "angler-armv7-non-gen-cc"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builder:angler-armv7-non-gen-cc"
dimensions: "device_type:oriole"
- dimensions: "os:Android"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -96,10 +90,7 @@
builders {
name: "angler-armv8-debug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:angler-armv8-debug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -123,10 +114,7 @@
builders {
name: "angler-armv8-ndebug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:angler-armv8-ndebug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -150,8 +138,8 @@
builders {
name: "angler-armv8-non-gen-cc"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builder:angler-armv8-non-gen-cc"
dimensions: "device_type:oriole"
- dimensions: "os:Android"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -175,10 +163,7 @@
builders {
name: "bullhead-armv7-gcstress-ndebug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:bullhead-armv7-gcstress-ndebug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -202,10 +187,7 @@
builders {
name: "bullhead-armv8-gcstress-debug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:bullhead-armv8-gcstress-debug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -229,10 +211,7 @@
builders {
name: "bullhead-armv8-gcstress-ndebug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:bullhead-armv8-gcstress-ndebug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -256,8 +235,7 @@
builders {
name: "fugu-debug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:fugu"
- dimensions: "os:Android"
+ dimensions: "builder:fugu-debug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -281,8 +259,7 @@
builders {
name: "fugu-ndebug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:fugu"
- dimensions: "os:Android"
+ dimensions: "builder:fugu-ndebug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -570,10 +547,7 @@
builders {
name: "walleye-armv7-poison-debug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:walleye-armv7-poison-debug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -597,10 +571,7 @@
builders {
name: "walleye-armv8-poison-debug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:walleye-armv8-poison-debug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -624,10 +595,7 @@
builders {
name: "walleye-armv8-poison-ndebug"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_type:bonito"
- dimensions: "device_type:oriole"
- dimensions: "device_type:walleye"
- dimensions: "os:Android"
+ dimensions: "builder:walleye-armv8-poison-ndebug"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index ee7d990..144c323 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -154,7 +154,12 @@
refs = ["refs/heads/master-art"],
)
-def ci_builder(name, category, short_name, dimensions):
+def ci_builder(name, category, short_name, dimensions=None):
+ dimensions = dimensions or {} # Initialize if it is None.
+ if category.startswith("host"):
+ dimensions["os"] = ["Linux"]
+ else:
+ dimensions["builder"] = name
luci.builder(
name = name,
bucket = "ci",
@@ -199,37 +204,31 @@
short_name = short_name,
)
-# Dimensions specify which bots we can run on.
-host_dims = {"os": "Linux"}
-target_dims = {"os": "Android"}
-arm_target_dims = target_dims | {"device_type": ["bonito", "oriole", "walleye"]}
-x86_target_dims = target_dims | {"device_type": ["fugu"]}
-
# userfault-GC configurations must be run on Pixel 6.
-userfault_gc_target_dims = target_dims | {"device_type": "oriole"}
+userfault_gc_target_dims = {"device_type": "oriole"}
-ci_builder("angler-armv7-debug", "angler|armv7", "dbg", arm_target_dims)
+ci_builder("angler-armv7-debug", "angler|armv7", "dbg")
ci_builder("angler-armv7-non-gen-cc", "angler|armv7", "ngen", userfault_gc_target_dims)
-ci_builder("angler-armv7-ndebug", "angler|armv7", "ndbg", arm_target_dims)
-ci_builder("angler-armv8-debug", "angler|armv8", "dbg", arm_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", userfault_gc_target_dims)
-ci_builder("angler-armv8-ndebug", "angler|armv8", "ndbg", arm_target_dims)
-ci_builder("bullhead-armv7-gcstress-ndebug", "bullhead|armv7|gcstress", "dbg", arm_target_dims)
-ci_builder("bullhead-armv8-gcstress-debug", "bullhead|armv8|gcstress", "dbg", arm_target_dims)
-ci_builder("bullhead-armv8-gcstress-ndebug", "bullhead|armv8|gcstress", "ndbg", arm_target_dims)
-ci_builder("fugu-debug", "fugu", "dbg", x86_target_dims)
-ci_builder("fugu-ndebug", "fugu", "ndbg", x86_target_dims)
-ci_builder("host-x86-cms", "host|x86", "cms", host_dims)
-ci_builder("host-x86-debug", "host|x86", "dbg", host_dims)
-ci_builder("host-x86-ndebug", "host|x86", "ndbg", host_dims)
-ci_builder("host-x86-gcstress-debug", "host|x86", "gcs", host_dims)
-ci_builder("host-x86-poison-debug", "host|x86", "psn", host_dims)
-ci_builder("host-x86_64-cdex-fast", "host|x64", "cdx", host_dims)
-ci_builder("host-x86_64-cms", "host|x64", "cms", host_dims)
-ci_builder("host-x86_64-debug", "host|x64", "dbg", host_dims)
-ci_builder("host-x86_64-non-gen-cc", "host|x64", "ngen", host_dims)
-ci_builder("host-x86_64-ndebug", "host|x64", "ndbg", host_dims)
-ci_builder("host-x86_64-poison-debug", "host|x64", "psn", host_dims)
-ci_builder("walleye-armv7-poison-debug", "walleye|armv7|poison", "dbg", arm_target_dims)
-ci_builder("walleye-armv8-poison-debug", "walleye|armv8|poison", "dbg", arm_target_dims)
-ci_builder("walleye-armv8-poison-ndebug", "walleye|armv8|poison", "ndbg", arm_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")
+ci_builder("bullhead-armv8-gcstress-ndebug", "bullhead|armv8|gcstress", "ndbg")
+ci_builder("fugu-debug", "fugu", "dbg")
+ci_builder("fugu-ndebug", "fugu", "ndbg")
+ci_builder("host-x86-cms", "host|x86", "cms")
+ci_builder("host-x86-debug", "host|x86", "dbg")
+ci_builder("host-x86-ndebug", "host|x86", "ndbg")
+ci_builder("host-x86-gcstress-debug", "host|x86", "gcs")
+ci_builder("host-x86-poison-debug", "host|x86", "psn")
+ci_builder("host-x86_64-cdex-fast", "host|x64", "cdx")
+ci_builder("host-x86_64-cms", "host|x64", "cms")
+ci_builder("host-x86_64-debug", "host|x64", "dbg")
+ci_builder("host-x86_64-non-gen-cc", "host|x64", "ngen")
+ci_builder("host-x86_64-ndebug", "host|x64", "ndbg")
+ci_builder("host-x86_64-poison-debug", "host|x64", "psn")
+ci_builder("walleye-armv7-poison-debug", "walleye|armv7|poison", "dbg")
+ci_builder("walleye-armv8-poison-debug", "walleye|armv8|poison", "dbg")
+ci_builder("walleye-armv8-poison-ndebug", "walleye|armv8|poison", "ndbg")