3 files changed, 18 insertions, 14 deletions
diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index 70860e6306..675bf2011b 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -300,7 +300,7 @@ buckets {
     builders {
       name: "host-x86-cms"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -327,7 +327,7 @@ buckets {
     builders {
       name: "host-x86-debug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -356,7 +356,7 @@ buckets {
     builders {
       name: "host-x86-gcstress-debug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -386,7 +386,7 @@ buckets {
     builders {
       name: "host-x86-ndebug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -414,7 +414,7 @@ buckets {
     builders {
       name: "host-x86-poison-debug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -444,7 +444,7 @@ buckets {
     builders {
       name: "host-x86_64-cms"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -471,7 +471,7 @@ buckets {
     builders {
       name: "host-x86_64-debug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -500,7 +500,7 @@ buckets {
     builders {
       name: "host-x86_64-ndebug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -528,7 +528,7 @@ buckets {
     builders {
       name: "host-x86_64-non-gen-cc"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -556,7 +556,7 @@ buckets {
     builders {
       name: "host-x86_64-poison-debug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -586,7 +586,7 @@ buckets {
     builders {
       name: "qemu-armv8-ndebug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -617,7 +617,7 @@ buckets {
     builders {
       name: "qemu-riscv64-ndebug"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.art.ci"
       recipe {
         name: "art"
@@ -648,7 +648,7 @@ buckets {
     builders {
       name: "qemu-riscv64-ndebug-build_only"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       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 6204c6f4b5..90bdf85851 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.43.10"
+  version: "1.43.13"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index 3f033242af..786b09c287 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -247,6 +247,10 @@ def add_builder(name,
         # Other than the `AP1A` builds above, all other devices are flashed to `SP2A`.
         # This avoids allocating `userfaultfd` devices for tests that don't need it.
         dimensions |= {"device_os": "S"}
+    elif mode == "host":
+      dimensions |= {"os": "Ubuntu-20"}
+    elif mode == "qemu":
+      dimensions |= {"os": "Ubuntu-22"}
 
     testrunner_args = ['--verbose', '--host'] if mode == 'host' else ['--target', '--verbose']
     testrunner_args += ['--debug'] if debug else ['--ndebug']