Move Art 5 tests to Ubuntu 24 (jammy) to see how that works
Also renamed an argument to be correct.
Bug: b/425835454
Bug: b/434083099
Change-Id: Icb69f87ec7e8e8f45ed9581f1ec46fcf852615b5
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 3a60dff..7d9b614 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -779,7 +779,7 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "normal:true"
- dimensions: "os:Ubuntu-22.04"
+ dimensions: "os:Ubuntu-24.04"
dimensions: "pool:luci.r8.ci"
exe {
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
@@ -817,7 +817,7 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "normal:true"
- dimensions: "os:Ubuntu-22.04"
+ dimensions: "os:Ubuntu-24.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 862f835..2f148d4 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=True):
+def get_dimensions(windows = False, internal = False, archive = False, jammy=True):
# We use the following setup:
# windows -> always windows machine
# internal -> always internal, single small, machine
@@ -181,10 +181,10 @@
if windows:
dimensions["os"] = "Windows-11"
else:
- if noble:
+ if jammy:
dimensions["os"] = "Ubuntu-22.04"
else:
- dimensions["os"] = "Ubuntu-20.04"
+ dimensions["os"] = "Ubuntu-24.04"
if internal:
dimensions["internal"] = "true"
elif archive:
@@ -404,7 +404,7 @@
r8_tester_with_default(
"linux-android-5",
["--dex_vm=5.1.1", "--all_tests", "--command_cache_dir=/tmp/ccache"],
- dimensions = get_dimensions(noble=True),
+ dimensions = get_dimensions(jammy=False),
)
r8_tester_with_default(