Try art 5, 6, 8, 10, 12 on noble

Bug: b/417870524
Change-Id: I77b925fa0a2989af1aab068fe1e2c6aa860dc699
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 64f047e..233773f 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -280,6 +280,82 @@
       }
     }
     builders {
+      name: "linux-android-10-noble"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=10.0.0",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "linux-android-10-noble_release"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=10.0.0",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "linux-android-10_release"
       swarming_host: "chrome-swarming.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -356,6 +432,82 @@
       }
     }
     builders {
+      name: "linux-android-12-noble"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=12.0.0",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "linux-android-12-noble_release"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=12.0.0",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "linux-android-12_release"
       swarming_host: "chrome-swarming.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -660,82 +812,6 @@
       }
     }
     builders {
-      name: "linux-android-4.0-noble"
-      swarming_host: "chrome-swarming.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "normal:true"
-      dimensions: "os:Ubuntu-24.04"
-      dimensions: "pool:luci.r8.ci"
-      exe {
-        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "builder_group": "internal.client.r8",'
-        '  "recipe": "rex",'
-        '  "test_options": ['
-        '    "--dex_vm=4.0.4",'
-        '    "--all_tests",'
-        '    "--command_cache_dir=/tmp/ccache",'
-        '    "--tool=r8",'
-        '    "--print-times",'
-        '    "--no_internal",'
-        '    "--one_line_per_test",'
-        '    "--archive_failures"'
-        '  ]'
-        '}'
-      priority: 26
-      execution_timeout_secs: 21600
-      expiration_secs: 126000
-      build_numbers: YES
-      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "linux-android-4.0-noble_release"
-      swarming_host: "chrome-swarming.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "normal:true"
-      dimensions: "os:Ubuntu-24.04"
-      dimensions: "pool:luci.r8.ci"
-      exe {
-        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "builder_group": "internal.client.r8",'
-        '  "recipe": "rex",'
-        '  "test_options": ['
-        '    "--dex_vm=4.0.4",'
-        '    "--all_tests",'
-        '    "--command_cache_dir=/tmp/ccache",'
-        '    "--tool=r8",'
-        '    "--print-times",'
-        '    "--no_internal",'
-        '    "--one_line_per_test",'
-        '    "--archive_failures"'
-        '  ]'
-        '}'
-      priority: 26
-      execution_timeout_secs: 21600
-      expiration_secs: 126000
-      build_numbers: YES
-      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "linux-android-4.0_release"
       swarming_host: "chrome-swarming.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -812,82 +888,6 @@
       }
     }
     builders {
-      name: "linux-android-4.4-noble"
-      swarming_host: "chrome-swarming.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "normal:true"
-      dimensions: "os:Ubuntu-24.04"
-      dimensions: "pool:luci.r8.ci"
-      exe {
-        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "builder_group": "internal.client.r8",'
-        '  "recipe": "rex",'
-        '  "test_options": ['
-        '    "--dex_vm=4.4.4",'
-        '    "--all_tests",'
-        '    "--command_cache_dir=/tmp/ccache",'
-        '    "--tool=r8",'
-        '    "--print-times",'
-        '    "--no_internal",'
-        '    "--one_line_per_test",'
-        '    "--archive_failures"'
-        '  ]'
-        '}'
-      priority: 26
-      execution_timeout_secs: 21600
-      expiration_secs: 126000
-      build_numbers: YES
-      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "linux-android-4.4-noble_release"
-      swarming_host: "chrome-swarming.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "normal:true"
-      dimensions: "os:Ubuntu-24.04"
-      dimensions: "pool:luci.r8.ci"
-      exe {
-        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "builder_group": "internal.client.r8",'
-        '  "recipe": "rex",'
-        '  "test_options": ['
-        '    "--dex_vm=4.4.4",'
-        '    "--all_tests",'
-        '    "--command_cache_dir=/tmp/ccache",'
-        '    "--tool=r8",'
-        '    "--print-times",'
-        '    "--no_internal",'
-        '    "--one_line_per_test",'
-        '    "--archive_failures"'
-        '  ]'
-        '}'
-      priority: 26
-      execution_timeout_secs: 21600
-      expiration_secs: 126000
-      build_numbers: YES
-      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "linux-android-4.4_release"
       swarming_host: "chrome-swarming.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -964,6 +964,82 @@
       }
     }
     builders {
+      name: "linux-android-5-noble"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=5.1.1",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "linux-android-5-noble_release"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=5.1.1",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "linux-android-5_release"
       swarming_host: "chrome-swarming.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1040,6 +1116,82 @@
       }
     }
     builders {
+      name: "linux-android-6-noble"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=6.0.1",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "linux-android-6-noble_release"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=6.0.1",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "linux-android-6_release"
       swarming_host: "chrome-swarming.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1192,6 +1344,82 @@
       }
     }
     builders {
+      name: "linux-android-8-noble"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=8.1.0",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "linux-android-8-noble_release"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "normal:true"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--dex_vm=8.1.0",'
+        '    "--all_tests",'
+        '    "--command_cache_dir=/tmp/ccache",'
+        '    "--tool=r8",'
+        '    "--print-times",'
+        '    "--no_internal",'
+        '    "--one_line_per_test",'
+        '    "--archive_failures"'
+        '  ]'
+        '}'
+      priority: 26
+      execution_timeout_secs: 21600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "linux-android-8_release"
       swarming_host: "chrome-swarming.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index 893add0..c6f120b 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -61,31 +61,31 @@
     short_name: "4.0"
   }
   builders {
-    name: "buildbucket/luci.r8.ci/linux-android-4.0-noble"
-    category: "R8"
-    short_name: "noble"
-  }
-  builders {
     name: "buildbucket/luci.r8.ci/linux-android-4.4"
     category: "R8"
     short_name: "4.4"
   }
   builders {
-    name: "buildbucket/luci.r8.ci/linux-android-4.4-noble"
-    category: "R8"
-    short_name: "noble"
-  }
-  builders {
     name: "buildbucket/luci.r8.ci/linux-android-5"
     category: "R8"
     short_name: "5"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-5-noble"
+    category: "R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-6"
     category: "R8"
     short_name: "6"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-6-noble"
+    category: "R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-7"
     category: "R8"
     short_name: "7"
@@ -96,6 +96,11 @@
     short_name: "8"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-8-noble"
+    category: "R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-9"
     category: "R8"
     short_name: "9"
@@ -106,11 +111,21 @@
     short_name: "10"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-10-noble"
+    category: "R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-12"
     category: "R8"
     short_name: "12"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-12-noble"
+    category: "R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-13"
     category: "R8"
     short_name: "13"
@@ -226,31 +241,31 @@
     short_name: "4.0"
   }
   builders {
-    name: "buildbucket/luci.r8.ci/linux-android-4.0-noble_release"
-    category: "Release|R8"
-    short_name: "noble"
-  }
-  builders {
     name: "buildbucket/luci.r8.ci/linux-android-4.4_release"
     category: "Release|R8"
     short_name: "4.4"
   }
   builders {
-    name: "buildbucket/luci.r8.ci/linux-android-4.4-noble_release"
-    category: "Release|R8"
-    short_name: "noble"
-  }
-  builders {
     name: "buildbucket/luci.r8.ci/linux-android-5_release"
     category: "Release|R8"
     short_name: "5"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-5-noble_release"
+    category: "Release|R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-6_release"
     category: "Release|R8"
     short_name: "6"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-6-noble_release"
+    category: "Release|R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-7_release"
     category: "Release|R8"
     short_name: "7"
@@ -261,6 +276,11 @@
     short_name: "8"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-8-noble_release"
+    category: "Release|R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-9_release"
     category: "Release|R8"
     short_name: "9"
@@ -271,11 +291,21 @@
     short_name: "10"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-10-noble_release"
+    category: "Release|R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-12_release"
     category: "Release|R8"
     short_name: "12"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-12-noble_release"
+    category: "Release|R8"
+    short_name: "noble"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-android-13_release"
     category: "Release|R8"
     short_name: "13"
diff --git a/infra/config/global/generated/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg
index b960fc4..19c934d 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -72,6 +72,30 @@
   }
   builders {
     bucket: "ci"
+    name: "linux-android-10-noble"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
+    name: "linux-android-10-noble_release"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
     name: "linux-android-10_release"
     repository: "https://r8.googlesource.com/r8"
   }
@@ -96,6 +120,30 @@
   }
   builders {
     bucket: "ci"
+    name: "linux-android-12-noble"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
+    name: "linux-android-12-noble_release"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
     name: "linux-android-12_release"
     repository: "https://r8.googlesource.com/r8"
   }
@@ -192,30 +240,6 @@
   }
   builders {
     bucket: "ci"
-    name: "linux-android-4.0-noble"
-    repository: "https://r8.googlesource.com/r8"
-  }
-}
-notifiers {
-  notifications {
-    on_failure: true
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "linux-android-4.0-noble_release"
-    repository: "https://r8.googlesource.com/r8"
-  }
-}
-notifiers {
-  notifications {
-    on_failure: true
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
     name: "linux-android-4.0_release"
     repository: "https://r8.googlesource.com/r8"
   }
@@ -240,30 +264,6 @@
   }
   builders {
     bucket: "ci"
-    name: "linux-android-4.4-noble"
-    repository: "https://r8.googlesource.com/r8"
-  }
-}
-notifiers {
-  notifications {
-    on_failure: true
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "linux-android-4.4-noble_release"
-    repository: "https://r8.googlesource.com/r8"
-  }
-}
-notifiers {
-  notifications {
-    on_failure: true
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
     name: "linux-android-4.4_release"
     repository: "https://r8.googlesource.com/r8"
   }
@@ -288,6 +288,30 @@
   }
   builders {
     bucket: "ci"
+    name: "linux-android-5-noble"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
+    name: "linux-android-5-noble_release"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
     name: "linux-android-5_release"
     repository: "https://r8.googlesource.com/r8"
   }
@@ -312,6 +336,30 @@
   }
   builders {
     bucket: "ci"
+    name: "linux-android-6-noble"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
+    name: "linux-android-6-noble_release"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
     name: "linux-android-6_release"
     repository: "https://r8.googlesource.com/r8"
   }
@@ -360,6 +408,30 @@
   }
   builders {
     bucket: "ci"
+    name: "linux-android-8-noble"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
+    name: "linux-android-8-noble_release"
+    repository: "https://r8.googlesource.com/r8"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
     name: "linux-android-8_release"
     repository: "https://r8.googlesource.com/r8"
   }
diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index e2fcc42..25a737f 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -123,6 +123,35 @@
   }
 }
 job {
+  id: "linux-android-10-noble"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-10-noble"
+  }
+}
+job {
+  id: "linux-android-10-noble_release"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-10-noble_release"
+  }
+}
+job {
   id: "linux-android-10_release"
   realm: "ci"
   acl_sets: "ci"
@@ -152,6 +181,35 @@
   }
 }
 job {
+  id: "linux-android-12-noble"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-12-noble"
+  }
+}
+job {
+  id: "linux-android-12-noble_release"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-12-noble_release"
+  }
+}
+job {
   id: "linux-android-12_release"
   realm: "ci"
   acl_sets: "ci"
@@ -268,35 +326,6 @@
   }
 }
 job {
-  id: "linux-android-4.0-noble"
-  realm: "ci"
-  acl_sets: "ci"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "linux-android-4.0-noble"
-  }
-}
-job {
-  id: "linux-android-4.0-noble_release"
-  realm: "ci"
-  acl_sets: "ci"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 1
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "linux-android-4.0-noble_release"
-  }
-}
-job {
   id: "linux-android-4.0_release"
   realm: "ci"
   acl_sets: "ci"
@@ -326,35 +355,6 @@
   }
 }
 job {
-  id: "linux-android-4.4-noble"
-  realm: "ci"
-  acl_sets: "ci"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "linux-android-4.4-noble"
-  }
-}
-job {
-  id: "linux-android-4.4-noble_release"
-  realm: "ci"
-  acl_sets: "ci"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 1
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "linux-android-4.4-noble_release"
-  }
-}
-job {
   id: "linux-android-4.4_release"
   realm: "ci"
   acl_sets: "ci"
@@ -384,6 +384,35 @@
   }
 }
 job {
+  id: "linux-android-5-noble"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-5-noble"
+  }
+}
+job {
+  id: "linux-android-5-noble_release"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-5-noble_release"
+  }
+}
+job {
   id: "linux-android-5_release"
   realm: "ci"
   acl_sets: "ci"
@@ -413,6 +442,35 @@
   }
 }
 job {
+  id: "linux-android-6-noble"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-6-noble"
+  }
+}
+job {
+  id: "linux-android-6-noble_release"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-6-noble_release"
+  }
+}
+job {
   id: "linux-android-6_release"
   realm: "ci"
   acl_sets: "ci"
@@ -471,6 +529,35 @@
   }
 }
 job {
+  id: "linux-android-8-noble"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-8-noble"
+  }
+}
+job {
+  id: "linux-android-8-noble_release"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "linux-android-8-noble_release"
+  }
+}
+job {
   id: "linux-android-8_release"
   realm: "ci"
   acl_sets: "ci"
@@ -916,17 +1003,20 @@
   realm: "ci"
   acl_sets: "ci"
   triggers: "archive_release"
+  triggers: "linux-android-10-noble_release"
   triggers: "linux-android-10_release"
+  triggers: "linux-android-12-noble_release"
   triggers: "linux-android-12_release"
   triggers: "linux-android-13_release"
   triggers: "linux-android-14_release"
-  triggers: "linux-android-4.0-noble_release"
   triggers: "linux-android-4.0_release"
-  triggers: "linux-android-4.4-noble_release"
   triggers: "linux-android-4.4_release"
+  triggers: "linux-android-5-noble_release"
   triggers: "linux-android-5_release"
+  triggers: "linux-android-6-noble_release"
   triggers: "linux-android-6_release"
   triggers: "linux-android-7_release"
+  triggers: "linux-android-8-noble_release"
   triggers: "linux-android-8_release"
   triggers: "linux-android-9_release"
   triggers: "linux-default_release"
@@ -952,18 +1042,21 @@
   triggers: "check"
   triggers: "desugared_library-jdk11_head"
   triggers: "linux-android-10"
+  triggers: "linux-android-10-noble"
   triggers: "linux-android-12"
+  triggers: "linux-android-12-noble"
   triggers: "linux-android-13"
   triggers: "linux-android-14"
   triggers: "linux-android-15"
   triggers: "linux-android-4.0"
-  triggers: "linux-android-4.0-noble"
   triggers: "linux-android-4.4"
-  triggers: "linux-android-4.4-noble"
   triggers: "linux-android-5"
+  triggers: "linux-android-5-noble"
   triggers: "linux-android-6"
+  triggers: "linux-android-6-noble"
   triggers: "linux-android-7"
   triggers: "linux-android-8"
+  triggers: "linux-android-8-noble"
   triggers: "linux-android-9"
   triggers: "linux-default"
   triggers: "linux-dev"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index b0780e6..5a25451 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -397,29 +397,30 @@
     max_concurrent_invocations = 2,
 )
 r8_tester_with_default(
-    "linux-android-4.0-noble",
-    ["--dex_vm=4.0.4", "--all_tests", "--command_cache_dir=/tmp/ccache"],
-     dimensions = get_dimensions(noble=True),
-)
-r8_tester_with_default(
     "linux-android-4.4",
     ["--dex_vm=4.4.4", "--all_tests", "--command_cache_dir=/tmp/ccache"],
 )
-r8_tester_with_default(
-    "linux-android-4.4-noble",
-    ["--dex_vm=4.4.4", "--all_tests", "--command_cache_dir=/tmp/ccache"],
-    dimensions = get_dimensions(noble=True),
-)
 
 r8_tester_with_default(
     "linux-android-5",
     ["--dex_vm=5.1.1", "--all_tests", "--command_cache_dir=/tmp/ccache"],
 )
 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),
+)
+
+r8_tester_with_default(
     "linux-android-6",
     ["--dex_vm=6.0.1", "--all_tests", "--command_cache_dir=/tmp/ccache"],
 )
 r8_tester_with_default(
+    "linux-android-6-noble",
+    ["--dex_vm=6.0.1", "--all_tests", "--command_cache_dir=/tmp/ccache"],
+    dimensions = get_dimensions(noble=True),
+)
+r8_tester_with_default(
     "linux-android-7",
     ["--dex_vm=7.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
     dimensions = get_dimensions(noble=True),
@@ -430,6 +431,11 @@
     ["--dex_vm=8.1.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
 )
 r8_tester_with_default(
+    "linux-android-8-noble",
+    ["--dex_vm=8.1.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
+    dimensions = get_dimensions(noble=True),
+)
+r8_tester_with_default(
     "linux-android-9",
     ["--dex_vm=9.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
 )
@@ -438,10 +444,20 @@
     ["--dex_vm=10.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
 )
 r8_tester_with_default(
+    "linux-android-10-noble",
+    ["--dex_vm=10.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
+    dimensions = get_dimensions(noble=True),
+)
+r8_tester_with_default(
     "linux-android-12",
     ["--dex_vm=12.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
 )
 r8_tester_with_default(
+    "linux-android-12-noble",
+    ["--dex_vm=12.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
+    dimensions = get_dimensions(noble=True),
+)
+r8_tester_with_default(
     "linux-android-13",
     ["--dex_vm=13.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
 )