Revert "LUCI: Limit userfault GC builds to Pixel 6"
This reverts commit 73db8facd835ac28b3b5d41fe46945896ad8aa38.
Reason for revert: Fails on LUCI
Change-Id: I1c1b5cbb7c53bf2c87b4ccef779488172c24805c
diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index 0cfd1fd..887b2af 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -66,7 +66,6 @@
name: "angler-armv7-non-gen-cc"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builder:angler-armv7-non-gen-cc"
- dimensions: "device_type:Pixel 6 (oriole)"
dimensions: "pool:luci.art.ci"
recipe {
name: "art"
@@ -139,7 +138,6 @@
name: "angler-armv8-non-gen-cc"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builder:angler-armv8-non-gen-cc"
- dimensions: "device_type:Pixel 6 (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 f9f7877..e066382 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.33.7"
+ version: "1.31.4"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index 398b138..5dd2fea 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, dimensions={}):
+def ci_builder(name, category, short_name):
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,14 +202,11 @@
short_name = short_name,
)
-# `userfaultfd`-based GC configuration must be run on Pixel 6.
-userfaultfd_gc_dims = {"device_type": "Pixel 6 (oriole)"}
-
ci_builder("angler-armv7-debug", "angler|armv7", "dbg")
-ci_builder("angler-armv7-non-gen-cc", "angler|armv7", "ngen", userfaultfd_gc_dims)
+ci_builder("angler-armv7-non-gen-cc", "angler|armv7", "ngen")
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", userfaultfd_gc_dims)
+ci_builder("angler-armv8-non-gen-cc", "angler|armv8", "ngen")
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")