Try art 5 on jammy
Bug: b/417870524
Change-Id: I03f71d3fba7424dd85e61d532f9f4eab572cb69e
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 233773f..d70e472 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -969,7 +969,7 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "normal:true"
- dimensions: "os:Ubuntu-24.04"
+ dimensions: "os:Ubuntu-22.04"
dimensions: "pool:luci.r8.ci"
exe {
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
@@ -1007,7 +1007,7 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "normal:true"
- dimensions: "os:Ubuntu-24.04"
+ dimensions: "os:Ubuntu-22.04"
dimensions: "pool:luci.r8.ci"
exe {
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 5a25451..ae2935d 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -168,7 +168,7 @@
default_timeout = time.hour * 6
-def get_dimensions(windows = False, internal = False, archive = False, noble=False):
+def get_dimensions(windows = False, internal = False, archive = False, noble=False, jammy=False):
# We use the following setup:
# windows -> always windows machine
# internal -> always internal, single small, machine
@@ -183,6 +183,8 @@
else:
if noble:
dimensions["os"] = "Ubuntu-24.04"
+ elif jammy:
+ dimensions["os"] = "Ubuntu-22.04"
else:
dimensions["os"] = "Ubuntu-20.04"
if internal:
@@ -408,7 +410,7 @@
r8_tester_with_default(
"linux-android-5-noble",
["--dex_vm=5.1.1", "--all_tests", "--command_cache_dir=/tmp/ccache"],
- dimensions = get_dimensions(noble=True),
+ dimensions = get_dimensions(jammy=True),
)
r8_tester_with_default(
